hash
stringlengths 40
40
| date
stringdate 2018-01-15 01:43:19
2024-04-02 15:49:23
| author
stringclasses 18
values | commit_message
stringlengths 10
72
| is_merge
bool 1
class | git_diff
stringlengths 132
6.87M
| type
stringclasses 11
values | masked_commit_message
stringlengths 4
58
|
|---|---|---|---|---|---|---|---|
414e30ce11615bbfcb68bf37883b6f2b0ddb7717
|
2020-10-21 13:04:02
|
crimx
|
refactor(dicts): update moji pronunciation
| false
|
diff --git a/src/components/Speaker/index.tsx b/src/components/Speaker/index.tsx
index f2104dcd3..ece0c5a23 100644
--- a/src/components/Speaker/index.tsx
+++ b/src/components/Speaker/index.tsx
@@ -1,9 +1,21 @@
-import React, { FC, ComponentProps, useCallback } from 'react'
+import React, {
+ FC,
+ ComponentProps,
+ useCallback,
+ useState,
+ useContext
+} from 'react'
+import { useUpdateEffect } from 'react-use'
import { timer, reflect } from '@/_helpers/promise-more'
+/** onPlayStart */
+const StaticSpeakerContext = React.createContext<
+ (src: string) => Promise<void>
+>(async () => {})
+
export interface SpeakerProps {
/** render nothing when no src */
- readonly src?: string
+ readonly src?: string | (() => Promise<string>)
/** @default 1.2em */
readonly width?: number | string
/** @default 1.2em */
@@ -14,6 +26,16 @@ export interface SpeakerProps {
* Speaker for playing audio files
*/
export const Speaker: FC<SpeakerProps> = props => {
+ const [src, setSrc] = useState(() =>
+ typeof props.src === 'string' ? props.src : '#'
+ )
+
+ const onPlayStart = useContext(StaticSpeakerContext)
+
+ useUpdateEffect(() => {
+ setSrc(typeof props.src === 'string' ? props.src : '#')
+ }, [props.src])
+
if (!props.src) return null
const width = props.width || props.height || '1.2em'
@@ -22,10 +44,19 @@ export const Speaker: FC<SpeakerProps> = props => {
return (
<a
className="saladict-Speaker"
- href={props.src}
+ href={src}
target="_blank"
rel="noopener noreferrer"
style={{ width, height }}
+ onClick={async e => {
+ if (src === '#' && typeof props.src === 'function') {
+ e.stopPropagation()
+ e.preventDefault()
+ const result = await props.src()
+ onPlayStart(result)
+ setSrc(result)
+ }
+ }}
></a>
)
}
@@ -49,6 +80,7 @@ export const StaticSpeakerContainer: FC<StaticSpeakerContainerProps> = props =>
e.target &&
e.target['tagName'] === 'A' &&
e.target['href'] &&
+ e.target['href'] !== '#' &&
e.target['classList'] &&
e.target['classList'].contains('saladict-Speaker')
) {
@@ -66,7 +98,11 @@ export const StaticSpeakerContainer: FC<StaticSpeakerContainerProps> = props =>
[onPlayStart]
)
- return <div onClick={onClick} {...restProps} />
+ return (
+ <StaticSpeakerContext.Provider value={onPlayStart}>
+ <div onClick={onClick} {...restProps} />
+ </StaticSpeakerContext.Provider>
+ )
}
/**
diff --git a/src/components/dictionaries/mojidict/View.tsx b/src/components/dictionaries/mojidict/View.tsx
index 5e2431ac0..f5a4d6d2b 100644
--- a/src/components/dictionaries/mojidict/View.tsx
+++ b/src/components/dictionaries/mojidict/View.tsx
@@ -1,15 +1,34 @@
import React, { FC } from 'react'
+import { PromiseType } from 'utility-types'
import Speaker from '@/components/Speaker'
import EntryBox from '@/components/EntryBox'
-import { MojidictResult } from './engine'
import { ViewPorps } from '@/components/dictionaries/helpers'
+import { message } from '@/_helpers/browser-api'
+import { MojidictResult, GetTTS } from './engine'
export const DictMojidict: FC<ViewPorps<MojidictResult>> = ({ result }) => (
<>
{result.word && (
<div>
<h1>{result.word.spell}</h1>
- <span>{result.word.pron}</span> <Speaker src={result.word.tts} />
+ <span>{result.word.pron}</span>{' '}
+ <Speaker
+ src={
+ result.word.tts ||
+ (() =>
+ message.send<
+ 'DICT_ENGINE_METHOD',
+ PromiseType<ReturnType<GetTTS>>
+ >({
+ type: 'DICT_ENGINE_METHOD',
+ payload: {
+ id: 'mojidict',
+ method: 'getTTS',
+ args: [result.word?.tarId, 102]
+ }
+ }))
+ }
+ />
</div>
)}
{result.details &&
@@ -29,6 +48,21 @@ export const DictMojidict: FC<ViewPorps<MojidictResult>> = ({ result }) => (
<li key={example.title}>
<p className="dictMojidict-Word_Title">
{example.title}
+ <Speaker
+ src={() =>
+ message.send<
+ 'DICT_ENGINE_METHOD',
+ PromiseType<ReturnType<GetTTS>>
+ >({
+ type: 'DICT_ENGINE_METHOD',
+ payload: {
+ id: 'mojidict',
+ method: 'getTTS',
+ args: [example.objectId, 103]
+ }
+ })
+ }
+ />
</p>
<p className="dictMojidict-Word_Trans">
{example.trans}
diff --git a/src/components/dictionaries/mojidict/engine.ts b/src/components/dictionaries/mojidict/engine.ts
index 93a73a569..8f7608099 100644
--- a/src/components/dictionaries/mojidict/engine.ts
+++ b/src/components/dictionaries/mojidict/engine.ts
@@ -65,17 +65,34 @@ interface SuggestsResult {
}>
}
+interface FetchTtsResult {
+ result: {
+ code: number
+ result?: {
+ text: string
+ url: string
+ identity: string
+ existed: boolean
+ msg: string
+ }
+ }
+}
+
export interface MojidictResult {
word?: {
+ tarId: string
spell: string
pron: string
- tts: string
+ tts?: string
}
details?: Array<{
+ objectId: string
title: string
subdetails?: Array<{
+ objectId: string
title: string
examples?: Array<{
+ objectId: string
title: string
trans: string
}>
@@ -95,11 +112,8 @@ export const search: SearchFunction<MojidictResult> = async (
) => {
const suggests = await getSuggests(text)
- const wordId =
- suggests.searchResults &&
- suggests.searchResults[0] &&
- suggests.searchResults[0].tarId
- if (!wordId) {
+ const tarId = suggests.searchResults?.[0]?.tarId
+ if (!tarId) {
return handleNoResult()
}
@@ -111,12 +125,7 @@ export const search: SearchFunction<MojidictResult> = async (
headers: {
'content-type': 'text/plain'
},
- data: JSON.stringify({
- wordId,
- _ApplicationId: process.env.MOJI_ID,
- _ClientVersion: 'js2.7.1',
- _InstallationId: getInstallationId()
- })
+ data: requestPayload({ wordId: tarId })
})
const result: MojidictResult = {}
@@ -124,31 +133,29 @@ export const search: SearchFunction<MojidictResult> = async (
if (wordResult && (wordResult.details || wordResult.word)) {
if (wordResult.word) {
result.word = {
+ tarId,
spell: wordResult.word.spell,
- pron: `${wordResult.word.pron || ''} ${wordResult.word.accent || ''}`,
- tts: await getTTS(wordResult.word.spell, wordResult.word.objectId)
+ pron: `${wordResult.word.pron || ''} ${wordResult.word.accent || ''}`
}
}
if (wordResult.details) {
result.details = wordResult.details.map(detail => ({
+ objectId: detail.objectId,
title: detail.title,
- subdetails:
- wordResult.subdetails &&
- wordResult.subdetails
- .filter(subdetail => subdetail.detailsId === detail.objectId)
- .map(subdetail => ({
- title: subdetail.title,
- examples:
- wordResult.examples &&
- wordResult.examples.filter(
- example => example.subdetailsId === subdetail.objectId
- )
- }))
+ subdetails: wordResult?.subdetails
+ ?.filter(subdetail => subdetail.detailsId === detail.objectId)
+ .map(subdetail => ({
+ objectId: subdetail.objectId,
+ title: subdetail.title,
+ examples: wordResult?.examples?.filter(
+ example => example.subdetailsId === subdetail.objectId
+ )
+ }))
}))
}
- if (suggests.words && suggests.words.length > 1) {
+ if (suggests.words && suggests?.words.length > 1) {
result.releated = suggests.words
.map(word => ({
title: `${word.spell} | ${word.pron || ''} ${word.accent || ''}`,
@@ -157,9 +164,12 @@ export const search: SearchFunction<MojidictResult> = async (
.slice(1)
}
- return result.word && result.word.tts
- ? { result, audio: { py: result.word.tts } }
- : { result }
+ if (result.word && config.autopron.cn.dict === 'mojidict') {
+ result.word.tts = await getTTS(tarId, 102)
+ return { result, audio: { py: result.word.tts } }
+ }
+
+ return { result }
}
return handleNoResult()
@@ -175,13 +185,10 @@ async function getSuggests(text: string): Promise<SuggestsResult> {
headers: {
'content-type': 'text/plain'
},
- data: JSON.stringify({
+ data: requestPayload({
langEnv: 'zh-CN_ja',
needWords: true,
- searchText: text,
- _ApplicationId: process.env.MOJI_ID,
- _ClientVersion: 'js2.7.1',
- _InstallationId: getInstallationId()
+ searchText: text
})
})
@@ -191,30 +198,44 @@ async function getSuggests(text: string): Promise<SuggestsResult> {
}
}
-async function getTTS(text: string, wordId: string): Promise<string> {
+/**
+ * @param tarId word id
+ * @param tarType 102 word, 103 sentence
+ */
+export async function getTTS(
+ tarId: string,
+ tarType: 102 | 103
+): Promise<string> {
try {
- const { data } = await axios({
+ const { data }: AxiosResponse<FetchTtsResult> = await axios({
method: 'post',
- url: 'https://api.mojidict.com/parse/functions/fetchTts',
+ url: 'https://api.mojidict.com/parse/functions/fetchTts_v2',
headers: {
'content-type': 'text/plain'
},
- data: JSON.stringify({
- identity: wordId,
- text,
- _ApplicationId: process.env.MOJI_ID,
- _ClientVersion: 'js2.7.1',
- _InstallationId: getInstallationId()
- })
+ data: requestPayload({ tarId, tarType })
})
- if (data.result && data.result.url) {
- return data.result.url
+ return data.result?.result?.url || ''
+ } catch (e) {
+ if (process.env.DEBUG) {
+ console.error(e)
}
- } catch (e) {}
+ }
return ''
}
+export type GetTTS = typeof getTTS
+
+function requestPayload(data: object) {
+ return JSON.stringify({
+ _ApplicationId: process.env.MOJI_ID,
+ _ClientVersion: 'js2.12.0',
+ _InstallationId: getInstallationId(),
+ ...data
+ })
+}
+
function getInstallationId() {
return s() + s() + '-' + s() + '-' + s() + '-' + s() + '-' + s() + s() + s()
}
|
refactor
|
update moji pronunciation
|
071cba80f46e1819b0dd37dd586fa77765e3c04f
|
2020-06-01 20:47:29
|
crimx
|
refactor(history): hide history button when tracking history is off
| false
|
diff --git a/src/_locales/zh-CN/content.ts b/src/_locales/zh-CN/content.ts
index 412788726..033c13933 100644
--- a/src/_locales/zh-CN/content.ts
+++ b/src/_locales/zh-CN/content.ts
@@ -10,7 +10,7 @@ export const locale = {
historyNext: '下一个查词记录',
searchText: '查单词',
openOptions: '打开设置',
- addToNotebook: '保存到生词本，右键打开生词本',
+ addToNotebook: '保存单词到生词本，右键打开生词本',
openNotebook: '打开生词本',
openHistory: '打开查词记录',
shareImg: '以图片方式分享查词结果',
diff --git a/src/_locales/zh-TW/content.ts b/src/_locales/zh-TW/content.ts
index d02272848..0296a9ed8 100644
--- a/src/_locales/zh-TW/content.ts
+++ b/src/_locales/zh-TW/content.ts
@@ -12,7 +12,7 @@ export const locale: typeof _locale = {
historyNext: '下一個查單字記錄',
searchText: '查單字',
openOptions: '開啟設定',
- addToNotebook: '儲存到單字本，右鍵開啟單字本',
+ addToNotebook: '儲存單字到單字本，右点击開啟單字本',
openNotebook: '開啟單字本',
openHistory: '開啟查單字記錄',
shareImg: '以圖片方式分享查單字結果',
diff --git a/src/background/context-menus.ts b/src/background/context-menus.ts
index b69b7da8b..f7d9cc223 100644
--- a/src/background/context-menus.ts
+++ b/src/background/context-menus.ts
@@ -218,7 +218,7 @@ export class ContextMenus {
)
}
- private async setContextMenus([{ contextMenus }, t]: [
+ private async setContextMenus([{ searchHistory, contextMenus }, t]: [
AppConfig,
TFunction
]): Promise<void> {
@@ -354,12 +354,14 @@ export class ContextMenus {
contexts: ['browser_action']
})
- // search history
- await createContextMenu({
- id: 'search_history',
- title: t('history_title'),
- contexts: ['browser_action']
- })
+ if (searchHistory) {
+ // search history
+ await createContextMenu({
+ id: 'search_history',
+ title: t('history_title'),
+ contexts: ['browser_action']
+ })
+ }
// Manual
await createContextMenu({
diff --git a/src/content/components/MenuBar/MenuBar.container.tsx b/src/content/components/MenuBar/MenuBar.container.tsx
index 8232b40ff..d67321f41 100644
--- a/src/content/components/MenuBar/MenuBar.container.tsx
+++ b/src/content/components/MenuBar/MenuBar.container.tsx
@@ -47,6 +47,7 @@ const mapStateToProps: MapStateToProps<
state.config.qsFocus) ||
isPopupPage()), // or popup page
enableSuggest: state.config.searchSuggests,
+ isTrackHistory: state.config.searchHistory,
histories: state.searchHistory,
historyIndex: state.historyIndex,
showedDictAuth: state.config.showedDictAuth,
diff --git a/src/content/components/MenuBar/MenuBar.stories.tsx b/src/content/components/MenuBar/MenuBar.stories.tsx
index cef74a8f7..40417317c 100644
--- a/src/content/components/MenuBar/MenuBar.stories.tsx
+++ b/src/content/components/MenuBar/MenuBar.stories.tsx
@@ -69,6 +69,7 @@ storiesOf('Content Scripts|Dict Panel/Menubar', module)
addToNoteBook={action('Add to Notebook')}
shouldFocus={true}
enableSuggest={boolean('Enable Suggest', true)}
+ isTrackHistory={boolean('Track History', true)}
histories={histories}
historyIndex={number('History Index', 0)}
updateHistoryIndex={action('Update History Index')}
diff --git a/src/content/components/MenuBar/MenuBar.tsx b/src/content/components/MenuBar/MenuBar.tsx
index 843ef19cb..c37df1b55 100644
--- a/src/content/components/MenuBar/MenuBar.tsx
+++ b/src/content/components/MenuBar/MenuBar.tsx
@@ -20,6 +20,7 @@ import {
HistoryNextBtn,
FavBtn,
HistoryBtn,
+ NotebookBtn,
PinBtn,
CloseBtn,
SidebarBtn,
@@ -40,6 +41,7 @@ export interface MenuBarProps {
shouldFocus: boolean
enableSuggest: boolean
+ isTrackHistory: boolean
histories: Word[]
historyIndex: number
updateHistoryIndex: (index: number) => any
@@ -144,15 +146,28 @@ export const MenuBar: FC<MenuBarProps> = props => {
}
}}
/>
- <HistoryBtn
- t={t}
- onClick={() =>
- message.send({
- type: 'OPEN_URL',
- payload: { url: 'history.html', self: true }
- })
- }
- />
+ {props.isTrackHistory ? (
+ <HistoryBtn
+ t={t}
+ onClick={() =>
+ message.send({
+ type: 'OPEN_URL',
+ payload: { url: 'history.html', self: true }
+ })
+ }
+ />
+ ) : (
+ <NotebookBtn
+ t={t}
+ onClick={() =>
+ message.send({
+ type: 'OPEN_URL',
+ payload: { url: 'notebook.html', self: true }
+ })
+ }
+ />
+ )}
+
{isQuickSearchPage() ? (
<>
<FocusBtn
diff --git a/src/content/components/MenuBar/MenubarBtns.stories.tsx b/src/content/components/MenuBar/MenubarBtns.stories.tsx
index 593b5f74d..2227425b7 100644
--- a/src/content/components/MenuBar/MenubarBtns.stories.tsx
+++ b/src/content/components/MenuBar/MenubarBtns.stories.tsx
@@ -13,6 +13,7 @@ import {
OptionsBtn,
FavBtn,
HistoryBtn,
+ NotebookBtn,
PinBtn,
FocusBtn,
CloseBtn,
@@ -97,6 +98,15 @@ storiesOf('Content Scripts|Dict Panel/Menubar', module)
/>
)
})
+ .add('NotebookBtn', () => {
+ return (
+ <NotebookBtn
+ t={i18next.getFixedT(i18next.language, 'content')}
+ disabled={boolean('Disabled', false)}
+ onClick={action('onClick')}
+ />
+ )
+ })
.add('PinBtn', () => {
return (
<PinBtn
diff --git a/src/content/components/MenuBar/MenubarBtns.tsx b/src/content/components/MenuBar/MenubarBtns.tsx
index a3596450d..9a7a0888a 100644
--- a/src/content/components/MenuBar/MenubarBtns.tsx
+++ b/src/content/components/MenuBar/MenubarBtns.tsx
@@ -144,6 +144,28 @@ export const HistoryBtn: FC<MenubarBtnProps> = props => {
)
}
+export const NotebookBtn: FC<MenubarBtnProps> = props => {
+ const { t, ...restProps } = props
+ return (
+ <button
+ className="menuBar-Btn"
+ title={t('tip.openNotebook')}
+ {...restProps}
+ >
+ <svg
+ className="menuBar-Btn_Icon"
+ xmlns="http://www.w3.org/2000/svg"
+ width="30"
+ height="30"
+ viewBox="0 0 64 64"
+ >
+ <path d="M 57.389 0.966 L 6.612 0.966 C 5.699 0.966 4.957 1.525 4.957 2.217 L 4.957 61.783 C 4.955 62.282 5.342 62.734 5.949 62.933 C 6.16 63.001 6.385 63.036 6.612 63.034 C 7.023 63.032 7.417 62.917 7.723 62.709 L 32.003 46.006 L 56.282 62.709 C 57.227 63.354 58.742 62.983 59.008 62.041 C 59.033 61.956 59.044 61.871 59.044 61.783 L 59.044 2.217 C 59.044 1.525 58.306 0.966 57.389 0.966 Z M 33.111 43.392 C 32.478 42.954 31.508 42.954 30.875 43.392 L 8.266 58.955 L 8.266 3.469 L 55.735 3.469 L 55.735 58.955 L 33.111 43.392 Z" />
+ <path d="M 47.508 17.756 C 47.287 17.526 46.994 17.375 46.677 17.33 L 37.446 15.988 L 33.262 7.693 C 32.767 6.7 31.382 6.614 30.77 7.541 C 30.737 7.59 30.708 7.641 30.68 7.693 L 26.555 16.06 L 17.325 17.401 C 16.225 17.56 15.712 18.849 16.399 19.722 C 16.44 19.774 16.484 19.822 16.532 19.867 L 23.252 26.3 L 21.723 35.561 C 21.541 36.655 22.613 37.537 23.653 37.146 C 23.708 37.127 23.763 37.102 23.816 37.076 L 32.066 32.748 L 40.316 37.076 C 41.3 37.59 42.472 36.845 42.425 35.737 C 42.423 35.679 42.417 35.619 42.407 35.561 L 40.792 26.3 L 47.472 19.794 C 48.045 19.243 48.061 18.33 47.508 17.756 Z M 38.238 24.857 C 37.899 25.186 37.744 25.661 37.821 26.127 L 39.031 33.165 L 32.687 29.835 C 32.265 29.613 31.765 29.613 31.344 29.835 L 25.013 33.165 L 26.223 26.113 C 26.3 25.646 26.145 25.174 25.806 24.844 L 20.685 19.853 L 27.768 18.743 C 28.236 18.672 28.641 18.376 28.849 17.95 L 32.023 11.531 L 35.196 17.95 C 35.403 18.376 35.808 18.672 36.277 18.743 L 43.36 19.766 L 38.238 24.857 Z" />
+ </svg>
+ </button>
+ )
+}
+
export interface PinBtnProps extends MenubarBtnProps {
/** Dict panel is pinned */
isPinned: boolean
|
refactor
|
hide history button when tracking history is off
|
24d487a21c7e7d8d1f89e6e0203119e286d426cf
|
2020-02-13 20:55:13
|
crimx
|
feat: add standalone word editor
| false
|
diff --git a/.neutrinorc.js b/.neutrinorc.js
index 1f6c68ebb..5482fb9e1 100644
--- a/.neutrinorc.js
+++ b/.neutrinorc.js
@@ -84,6 +84,10 @@ module.exports = {
entry: 'quick-search'
},
+ 'word-editor': {
+ entry: 'word-editor'
+ },
+
'audio-control': {
entry: 'audio-control'
}
diff --git a/src/content/components/WordEditor/WordEditorPanel.tsx b/src/content/components/WordEditor/WordEditorPanel.tsx
index 1332d8715..e4aa21264 100644
--- a/src/content/components/WordEditor/WordEditorPanel.tsx
+++ b/src/content/components/WordEditor/WordEditorPanel.tsx
@@ -1,7 +1,7 @@
import React, { FC } from 'react'
export interface WordEditorPanelProps {
- containerWidth: number
+ containerWidth: number | string
colors: React.CSSProperties
title: React.ReactNode
btns?: ReadonlyArray<{
diff --git a/src/content/components/WordEditor/WordEditorStandalone.container.tsx b/src/content/components/WordEditor/WordEditorStandalone.container.tsx
new file mode 100644
index 000000000..3b8e39e88
--- /dev/null
+++ b/src/content/components/WordEditor/WordEditorStandalone.container.tsx
@@ -0,0 +1,26 @@
+import { connect } from 'react-redux'
+import { MapStateToProps } from 'react-retux'
+import { StoreState } from '@/content/redux/modules'
+import { WordEditor, WordEditorProps } from './WordEditor'
+
+const onClose = () => {
+ window.close()
+}
+
+const mapStateToProps: MapStateToProps<
+ StoreState,
+ WordEditorProps
+> = state => ({
+ darkMode: state.config.darkMode,
+ colors: state.colors,
+ containerWidth: '100vw',
+ ctxTrans: state.config.ctxTrans,
+ wordEditor: state.wordEditor,
+ onClose
+})
+
+export const WordEditorStandaloneContainer = connect(mapStateToProps)(
+ WordEditor
+)
+
+export default WordEditorStandaloneContainer
diff --git a/src/content/redux/epics/index.ts b/src/content/redux/epics/index.ts
index e3e79c310..5766a19dd 100644
--- a/src/content/redux/epics/index.ts
+++ b/src/content/redux/epics/index.ts
@@ -11,7 +11,6 @@ import { ofType } from './utils'
import searchStartEpic from './searchStart.epic'
import newSelectionEpic from './newSelection.epic'
import { translateCtxs, genCtxText } from '@/_helpers/translateCtx'
-import { message } from '@/_helpers/browser-api'
export const epics = combineEpics<StoreAction, StoreAction, StoreState>(
/** Start searching text. This will also send to Redux. */
@@ -37,18 +36,33 @@ export const epics = combineEpics<StoreAction, StoreAction, StoreState>(
state$.value.searchHistory[state$.value.searchHistory.length - 1]
if (isPopupPage() || isStandalonePage()) {
+ const { width: screenWidth, height: screenHeight } = window.screen
+ const width = Math.round(Math.min(Math.max(screenWidth, 440), 640))
+ const height = Math.round(Math.min(screenHeight - 150, 800))
+
+ let wordString = ''
try {
- message.send({
- type: 'OPEN_URL',
- payload: {
- url: `notebook.html?word=${encodeURIComponent(
- JSON.stringify(word)
- )}`,
- self: true
- }
+ wordString = encodeURIComponent(JSON.stringify(word))
+ } catch (e) {
+ console.warn(e)
+ }
+
+ browser.windows
+ .create({
+ type: 'popup',
+ url: browser.runtime.getURL(
+ `word-editor.html?word=${wordString}`
+ ),
+ top: Math.round((screenHeight - height) / 2),
+ left: Math.round((screenWidth - width) / 2),
+ width,
+ height
})
- return empty()
- } catch (e) {}
+ .catch(e => {
+ console.warn(e)
+ })
+
+ return empty()
}
return of({
diff --git a/src/word-editor/env.ts b/src/word-editor/env.ts
new file mode 100644
index 000000000..74ff49978
--- /dev/null
+++ b/src/word-editor/env.ts
@@ -0,0 +1,3 @@
+export {}
+
+window.__SALADICT_INTERNAL_PAGE__ = true
diff --git a/src/word-editor/index.tsx b/src/word-editor/index.tsx
new file mode 100644
index 000000000..9a97a3ac9
--- /dev/null
+++ b/src/word-editor/index.tsx
@@ -0,0 +1,42 @@
+import './env'
+
+import React from 'react'
+import ReactDOM from 'react-dom'
+
+import { Provider as ProviderRedux } from 'react-redux'
+import createStore from '@/content/redux/create'
+
+import { I18nextProvider as ProviderI18next } from 'react-i18next'
+import { i18nLoader } from '@/_helpers/i18n'
+
+import { WordEditorStandaloneContainer } from '@/content/components/WordEditor/WordEditorStandalone.container'
+
+import './word-editor.scss'
+
+document.title = 'Saladict Word Editor'
+
+const store = createStore()
+const i18n = i18nLoader()
+
+const searchParams = new URL(document.URL).searchParams
+
+const wordString = searchParams.get('word')
+if (wordString) {
+ try {
+ const word = JSON.parse(decodeURIComponent(wordString))
+ if (word) {
+ store.dispatch({ type: 'WORD_EDITOR_STATUS', payload: { word } })
+ }
+ } catch (e) {
+ console.warn(e)
+ }
+}
+
+ReactDOM.render(
+ <ProviderRedux store={store}>
+ <ProviderI18next i18n={i18n}>
+ <WordEditorStandaloneContainer />
+ </ProviderI18next>
+ </ProviderRedux>,
+ document.getElementById('root')
+)
diff --git a/src/word-editor/word-editor.scss b/src/word-editor/word-editor.scss
new file mode 100644
index 000000000..8f8a9ebe2
--- /dev/null
+++ b/src/word-editor/word-editor.scss
@@ -0,0 +1,33 @@
+@import '@/content/components/WordEditor/WordEditor.scss';
+
+html,
+body,
+#root {
+ position: static;
+ height: 100%;
+ margin: 0;
+ padding: 0;
+ // hide white spaces
+ font-size: 0;
+}
+
+#root {
+ overflow: hidden;
+}
+
+.wordEditorPanel-Background {
+ position: relative;
+}
+
+.wordEditorPanel-Container {
+ width: 100% !important;
+}
+
+.wordEditorPanel {
+ width: 100% !important;
+ height: 100vh !important;
+ max-width: unset;
+ max-height: unset;
+ border-radius: 0;
+ box-shadow: none;
+}
|
feat
|
add standalone word editor
|
f67ad2fc8c198529ac8c07d5b66ae83f6c04a6a1
|
2019-01-24 23:23:39
|
CRIMX
|
chore(release): 6.23.0
| false
|
diff --git a/CHANGELOG.md b/CHANGELOG.md
index f84bdfadd..300216354 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,41 @@
All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
+<a name="6.23.0"></a>
+# [6.23.0](https://github.com/crimx/ext-saladict/compare/v6.22.8...v6.23.0) (2019-01-24)
+
+
+### Bug Fixes
+
+* **panel:** open notebook on right click ([0099024](https://github.com/crimx/ext-saladict/commit/0099024))
+* close [#289](https://github.com/crimx/ext-saladict/issues/289) ([1615794](https://github.com/crimx/ext-saladict/commit/1615794))
+* **options:** add description ([deca4cb](https://github.com/crimx/ext-saladict/commit/deca4cb))
+* **options:** add valuePropName for switch ([8574a30](https://github.com/crimx/ext-saladict/commit/8574a30))
+* **options:** close modal ([b241d8b](https://github.com/crimx/ext-saladict/commit/b241d8b))
+* **options:** fix holding toggling ([5f7cdfe](https://github.com/crimx/ext-saladict/commit/5f7cdfe))
+* **options:** get profile id list on init ([114ccf0](https://github.com/crimx/ext-saladict/commit/114ccf0))
+* **options:** keep modal hide animation ([18ce805](https://github.com/crimx/ext-saladict/commit/18ce805))
+* **options:** remove unused ([0c6ea6d](https://github.com/crimx/ext-saladict/commit/0c6ea6d))
+* **popup:** fix popup flickering ([90b7d72](https://github.com/crimx/ext-saladict/commit/90b7d72))
+* **selection:** extract sentence head ([d5649e0](https://github.com/crimx/ext-saladict/commit/d5649e0)), closes [#287](https://github.com/crimx/ext-saladict/issues/287)
+* disable warning on dev ([2abc24a](https://github.com/crimx/ext-saladict/commit/2abc24a))
+* fix config typing ([d164efb](https://github.com/crimx/ext-saladict/commit/d164efb))
+* fix type error ([3db0b88](https://github.com/crimx/ext-saladict/commit/3db0b88))
+* **options:** update active profile name on init ([83cadf3](https://github.com/crimx/ext-saladict/commit/83cadf3))
+* remove activeProfileID when reset ([bbd5f01](https://github.com/crimx/ext-saladict/commit/bbd5f01))
+* **options:** replace p elements with lis ([ed42ccb](https://github.com/crimx/ext-saladict/commit/ed42ccb))
+* **profiles:** fix addActiveProfileListener ([2c67642](https://github.com/crimx/ext-saladict/commit/2c67642))
+* langcode comparison ([4dade9b](https://github.com/crimx/ext-saladict/commit/4dade9b))
+
+
+### Features
+
+* **content:** add salad bowl clicking ([e6834af](https://github.com/crimx/ext-saladict/commit/e6834af))
+* **popup:** add browser action behaviors ([6672a7a](https://github.com/crimx/ext-saladict/commit/6672a7a)), closes [#280](https://github.com/crimx/ext-saladict/issues/280)
+* add context translate engines config ([52e390b](https://github.com/crimx/ext-saladict/commit/52e390b))
+
+
+
<a name="6.22.8"></a>
## [6.22.8](https://github.com/crimx/ext-saladict/compare/v6.22.7...v6.22.8) (2019-01-07)
diff --git a/package.json b/package.json
index e0ed7989e..47de90d87 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
{
"name": "saladict",
- "version": "6.22.8",
+ "version": "6.23.0",
"description": "Chrome extension and Firefox WebExtension, inline translator powered by mutiple online dictionaries",
"private": true,
"scripts": {
|
chore
|
6.23.0
|
7400265d2620f9a9c8317beb82b10cd851959ec8
|
2018-10-17 09:25:38
|
CRIMX
|
refactor(options): update keyboard explanation
| false
|
diff --git a/src/_locales/options/messages.json b/src/_locales/options/messages.json
index c482fc0ee..179995386 100644
--- a/src/_locales/options/messages.json
+++ b/src/_locales/options/messages.json
@@ -375,9 +375,9 @@
"zh_TW": "滑鼠雙點擊間隔"
},
"mode_explain": {
- "en": "<ul><li><strong>'Show Icon'</strong>, a cute little icon pops up nearby the cursor; </li><li><strong>'Directly Search'</strong>, the dictionary panel shows up directly; </li><li><strong>'Double Click'</strong>, dictionary panel shows up after double click selection; </li><li><strong>'Hold a Key'</strong>, the selected key must be pressed when the selection is made; </li><li><strong>'Instant Capture'</strong>, selection is automatically made near by the cursor. </li></ul>",
- "zh_CN": "<ul><li><strong>“显示图标”</strong>会先在鼠标附近显示一个图标，鼠标移上去后才显示词典面板；</li><li><strong>“直接搜索”</strong>则不显示图标，直接显示词典面板；</li><li><strong>“双击搜索”</strong>双击选择文本之后直接显示词典面板；</li><li><strong>“按住按键”</strong>在放开鼠标之前按住选择的按键才显示词典面板；</li><li><strong>“鼠标悬浮取词”</strong>会自动选取鼠标下发的单词，可配合快捷键开启关闭。</li></ul>",
- "zh_TW": "<ul><li><strong>「顯示圖案」</strong>會先在滑鼠附近顯示一個圖案，滑鼠移動到圖案，會顯示出字典的視窗介面；</li><li><strong>「直接搜尋」</strong>則不會顯示圖案，直接顯示字典視窗介面；</li><li><strong>「滑鼠雙點擊」</strong>滑鼠雙點擊所選擇的句子或單字後，會直接顯示字典視窗介面；</li><li><strong>「按住按键」</strong>在放開滑鼠之前，需按住選擇的按鍵才顯示字典視窗介面；</li><li><strong>「滑鼠懸浮取詞」</strong>會自動選取滑鼠下方的單字，可配合快捷鍵啓用與關閉。</li></ul>"
+ "en": "<ul><li><strong>'Show Icon'</strong>, a cute little icon pops up nearby the cursor; </li><li><strong>'Directly Search'</strong>, the dictionary panel shows up directly; </li><li><strong>'Double Click'</strong>, dictionary panel shows up after double click selection; </li><li><strong>'Hold a Key'</strong>, the selected key must be pressed when the selection is made (Meta key is <kbd>⌘ Command</kbd> on Mac and <kbd>⊞ Windows</kbd> for others); </li><li><strong>'Instant Capture'</strong>, selection is automatically made near by the cursor. </li></ul>",
+ "zh_CN": "<ul><li><strong>“显示图标”</strong>会先在鼠标附近显示一个图标，鼠标移上去后才显示词典面板；</li><li><strong>“直接搜索”</strong>则不显示图标，直接显示词典面板；</li><li><strong>“双击搜索”</strong>双击选择文本之后直接显示词典面板；</li><li><strong>“按住按键”</strong>在放开鼠标之前按住选择的按键才显示词典面板（Meta 键为 Mac 上的 <kbd>⌘ Command</kbd> 键以及其它键盘的 <kbd>⊞ Windows</kbd> 键）；</li><li><strong>“鼠标悬浮取词”</strong>会自动选取鼠标下发的单词，可配合快捷键开启关闭。</li></ul>",
+ "zh_TW": "<ul><li><strong>「顯示圖案」</strong>會先在滑鼠附近顯示一個圖案，滑鼠移動到圖案，會顯示出字典的視窗介面；</li><li><strong>「直接搜尋」</strong>則不會顯示圖案，直接顯示字典視窗介面；</li><li><strong>「滑鼠雙點擊」</strong>滑鼠雙點擊所選擇的句子或單字後，會直接顯示字典視窗介面；</li><li><strong>「按住按键」</strong>在放開滑鼠之前，需按住選擇的按鍵才顯示字典視窗介面（Meta 鍵為 Mac 上的 <kbd>⌘ Command</kbd> 鍵以及其它鍵盤的 <kbd>⊞ Windows</kbd> 鍵）；</li><li><strong>「滑鼠懸浮取詞」</strong>會自動選取滑鼠下方的單字，可配合快捷鍵啓用與關閉。</li></ul>"
},
"mode_holding": {
"en": "Hold a key",
@@ -385,19 +385,19 @@
"zh_TW": "按住按键"
},
"mode_holding_ctrl": {
- "en": "Hold Ctrl key",
- "zh_CN": "按住 Ctrl 键",
- "zh_TW": "按住 Ctrl 键"
+ "en": "<kbd>Ctrl</kbd>",
+ "zh_CN": "<kbd>Ctrl</kbd>",
+ "zh_TW": "<kbd>Ctrl</kbd>"
},
"mode_holding_meta": {
- "en": "Hold Meta key",
- "zh_CN": "按住 Meta 键",
- "zh_TW": "按住 Meta 键"
+ "en": "<kbd>Meta(⌘/⊞)</kbd>",
+ "zh_CN": "<kbd>Meta(⌘/⊞)</kbd>",
+ "zh_TW": "<kbd>Meta(⌘/⊞)</kbd>"
},
"mode_holding_shift": {
- "en": "Hold Shift key",
- "zh_CN": "按住 Shift 键",
- "zh_TW": "按住 Shift 键"
+ "en": "<kbd>Shift</kbd>",
+ "zh_CN": "<kbd>Shift</kbd>",
+ "zh_TW": "<kbd>Shift</kbd>"
},
"mode_holding_subtitle": {
"en": "Chose holding keys:",
@@ -611,13 +611,13 @@
},
"triple_ctrl": {
"en": "Open via Triple-Ctrl",
- "zh_CN": "三按 ctrl 开启",
- "zh_TW": "三按 ctrl 開啟"
+ "zh_CN": "三按 ctrl/⌘ 开启",
+ "zh_TW": "三按 ctrl/⌘ 開啟"
},
"triple_ctrl_description": {
- "en": "Press <kbd>Ctrl</kbd> or <kbd>Command ⌘</kbd> key three times (or with browser shortkey) to summon the dictionary panel. <br>Preloaded content will be inserted into input box. Enable auto search to search as soon as the panel shows up.",
- "zh_CN": "连续按三次<kbd>Ctrl</kbd>或者<kbd>Command ⌘</kbd>键（或设置浏览器快捷键）将弹出词典界面。<br>选择预先加载内容会显示在输入框里。启动自动查词将在面板出现之后自动开始查词。<br>若打开为新窗口可额外设置划词模式，或不对主页面划词响应（做单独词典窗口用）。",
- "zh_TW": "連續按三次<kbd>Ctrl</kbd>或者<kbd>Command ⌘</kbd>鍵（或設定瀏覽器快捷鍵），將會彈出字典視窗介面。<br>選擇預先下載的內容，會顯示在輸入框裡。啟動自動查字功能，字典視窗介面會出現，此時，會自動開始查尋單字。<br>若開啟為新視窗可額外設定劃詞模式，或不對主頁面劃詞響應（做單獨字典視窗用）。"
+ "en": "Press <kbd>⌘ Command</kbd>(Mac) or <kbd>Ctrl</kbd>(Others) three times (or with browser shortkey) to summon the dictionary panel. <br>Preloaded content will be inserted into input box. Enable auto search to search as soon as the panel shows up.",
+ "zh_CN": "连续按三次<kbd>⌘ Command</kbd>（Mac）或者<kbd>Ctrl</kbd>（其它键盘）（或设置浏览器快捷键）将弹出词典界面。<br>选择预先加载内容会显示在输入框里。启动自动查词将在面板出现之后自动开始查词。<br>若打开为新窗口可额外设置划词模式，或不对主页面划词响应（做单独词典窗口用）。",
+ "zh_TW": "連續按三次<kbd>⌘ Command</kbd>（Mac）或者<kbd>Ctrl</kbd>（其它键盘）（或設定瀏覽器快捷鍵），將會彈出字典視窗介面。<br>選擇預先下載的內容，會顯示在輸入框裡。啟動自動查字功能，字典視窗介面會出現，此時，會自動開始查尋單字。<br>若開啟為新視窗可額外設定劃詞模式，或不對主頁面劃詞響應（做單獨字典視窗用）。"
},
"triple_ctrl_height": {
"en": "Window Height",
diff --git a/src/options/OptMode.vue b/src/options/OptMode.vue
index d59e38d81..0d4b5f2cc 100644
--- a/src/options/OptMode.vue
+++ b/src/options/OptMode.vue
@@ -21,16 +21,16 @@
<input type="checkbox" v-model="mode.instant.enable"> {{ $t('opt:mode_instant') }}
</label>
</div>
- <div v-if="holding">
+ <div v-if="holding" style="margin: 10px 0;">
<span>{{ $t('opt:mode_holding_subtitle') }}</span>
<label class="checkbox-inline">
- <input type="checkbox" v-model="mode.holding.shift"> {{ $t('opt:mode_holding_shift') }}
+ <input type="checkbox" v-model="mode.holding.shift"> <span v-html="$t('opt:mode_holding_shift')" />
</label>
<label class="checkbox-inline">
- <input type="checkbox" v-model="mode.holding.ctrl"> {{ $t('opt:mode_holding_ctrl') }}
+ <input type="checkbox" v-model="mode.holding.ctrl"> <span v-html="$t('opt:mode_holding_ctrl')" />
</label>
<label class="checkbox-inline">
- <input type="checkbox" v-model="mode.holding.meta"> {{ $t('opt:mode_holding_meta') }}
+ <input type="checkbox" v-model="mode.holding.meta"> <span v-html="$t('opt:mode_holding_meta')" />
</label>
</div>
<div class="input-group" v-if="mode.double">
diff --git a/src/options/OptPanelMode.vue b/src/options/OptPanelMode.vue
index bde27d299..d8b220e54 100644
--- a/src/options/OptPanelMode.vue
+++ b/src/options/OptPanelMode.vue
@@ -18,16 +18,16 @@
<input type="checkbox" v-model="panelMode.instant.enable"> {{ $t('opt:mode_instant') }}
</label>
</div>
- <div v-if="holding">
+ <div v-if="holding" style="margin: 10px 0;">
<span>{{ $t('opt:mode_holding_subtitle') }}</span>
<label class="checkbox-inline">
- <input type="checkbox" v-model="panelMode.holding.shift"> {{ $t('opt:mode_holding_shift') }}
+ <input type="checkbox" v-model="panelMode.holding.shift"> <span v-html="$t('opt:mode_holding_shift')" />
</label>
<label class="checkbox-inline">
- <input type="checkbox" v-model="panelMode.holding.ctrl"> {{ $t('opt:mode_holding_ctrl') }}
+ <input type="checkbox" v-model="panelMode.holding.ctrl"> <span v-html="$t('opt:mode_holding_ctrl')" />
</label>
<label class="checkbox-inline">
- <input type="checkbox" v-model="panelMode.holding.meta"> {{ $t('opt:mode_holding_meta') }}
+ <input type="checkbox" v-model="panelMode.holding.meta"> <span v-html="$t('opt:mode_holding_meta')" />
</label>
</div>
<div class="input-group" v-if="panelMode.double">
diff --git a/src/options/OptPinMode.vue b/src/options/OptPinMode.vue
index b86faff47..67d2f759c 100644
--- a/src/options/OptPinMode.vue
+++ b/src/options/OptPinMode.vue
@@ -18,16 +18,16 @@
<input type="checkbox" v-model="pinMode.instant.enable"> {{ $t('opt:mode_instant') }}
</label>
</div>
- <div v-if="holding">
+ <div v-if="holding" style="margin: 10px 0;">
<span>{{ $t('opt:mode_holding_subtitle') }}</span>
<label class="checkbox-inline">
- <input type="checkbox" v-model="pinMode.holding.shift"> {{ $t('opt:mode_holding_shift') }}
+ <input type="checkbox" v-model="pinMode.holding.shift"> <span v-html="$t('opt:mode_holding_shift')" />
</label>
<label class="checkbox-inline">
- <input type="checkbox" v-model="pinMode.holding.ctrl"> {{ $t('opt:mode_holding_ctrl') }}
+ <input type="checkbox" v-model="pinMode.holding.ctrl"> <span v-html="$t('opt:mode_holding_ctrl')" />
</label>
<label class="checkbox-inline">
- <input type="checkbox" v-model="pinMode.holding.meta"> {{ $t('opt:mode_holding_meta') }}
+ <input type="checkbox" v-model="pinMode.holding.meta"> <span v-html="$t('opt:mode_holding_meta')" />
</label>
</div>
<div class="input-group" v-if="pinMode.double">
diff --git a/src/options/OptTripleCtrl.vue b/src/options/OptTripleCtrl.vue
index 19b301adb..b4c1d4a46 100644
--- a/src/options/OptTripleCtrl.vue
+++ b/src/options/OptTripleCtrl.vue
@@ -34,12 +34,10 @@
<input type="checkbox" v-model="tripleCtrlPageSel"> {{ $t('opt:triple_ctrl_page_selection') }}
</label>
</div>
- <div v-if="tripleCtrlStandalone" class="checkbox">
- <div class="input-group">
- <div class="input-group-addon">{{ $t('opt:triple_ctrl_height') }}</div>
- <input type="number" min="50" class="form-control" v-model.number="tripleCtrlHeight">
- <div class="input-group-addon">px</div>
- </div>
+ <div v-if="tripleCtrlStandalone" class="input-group">
+ <div class="input-group-addon">{{ $t('opt:triple_ctrl_height') }}</div>
+ <input type="number" min="50" class="form-control" v-model.number="tripleCtrlHeight">
+ <div class="input-group-addon">px</div>
</div>
<div v-if="tripleCtrlStandalone && tripleCtrlPageSel">
<p style="font-weight: bold;">{{ $t('opt:mode_title') }}:</p>
@@ -57,16 +55,16 @@
<input type="checkbox" v-model="qsPanelMode.instant.enable"> {{ $t('opt:mode_instant') }}
</label>
</div>
- <div v-if="holding">
+ <div v-if="holding" style="margin: 10px 0;">
<span>{{ $t('opt:mode_holding_subtitle') }}</span>
<label class="checkbox-inline">
- <input type="checkbox" v-model="qsPanelMode.holding.shift"> {{ $t('opt:mode_holding_shift') }}
+ <input type="checkbox" v-model="qsPanelMode.holding.shift"> <span v-html="$t('opt:mode_holding_shift')" />
</label>
<label class="checkbox-inline">
- <input type="checkbox" v-model="qsPanelMode.holding.ctrl"> {{ $t('opt:mode_holding_ctrl') }}
+ <input type="checkbox" v-model="qsPanelMode.holding.ctrl"> <span v-html="$t('opt:mode_holding_ctrl')" />
</label>
<label class="checkbox-inline">
- <input type="checkbox" v-model="qsPanelMode.holding.meta"> {{ $t('opt:mode_holding_meta') }}
+ <input type="checkbox" v-model="qsPanelMode.holding.meta"> <span v-html="$t('opt:mode_holding_meta')" />
</label>
</div>
<div class="input-group" v-if="qsPanelMode.double">
|
refactor
|
update keyboard explanation
|
0cf94cad773da488453278aa8fd1606989684a58
|
2018-12-20 16:35:36
|
CRIMX
|
test(dicts): update source pages
| false
|
diff --git a/test/specs/components/dictionaries/cambridge/response/catch-zht.html b/test/specs/components/dictionaries/cambridge/response/catch-zht.html
index 4846826fb..2d62b32f4 100644
--- a/test/specs/components/dictionaries/cambridge/response/catch-zht.html
+++ b/test/specs/components/dictionaries/cambridge/response/catch-zht.html
@@ -13,10 +13,12 @@
+
+
+
<link rel="canonical" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%B9%81%E4%BD%93/catch" />
<meta property="og:url" content="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%B9%81%E4%BD%93/catch" />
-
<link rel="alternate" hreflang="en" href="https://dictionary.cambridge.org/dictionary/english-chinese-traditional/catch"/>
<link rel="alternate" hreflang="en-US" href="https://dictionary.cambridge.org/us/dictionary/english-chinese-traditional/catch"/>
<link rel="alternate" hreflang="en-MX" href="https://dictionary.cambridge.org/us/dictionary/english-chinese-traditional/catch"/>
@@ -25,6 +27,7 @@
<link rel="alternate" hreflang="en-CO" href="https://dictionary.cambridge.org/us/dictionary/english-chinese-traditional/catch"/>
<link rel="alternate" hreflang="es" href="https://dictionary.cambridge.org/es/diccionario/ingles-chino-tradicional/catch"/>
<link rel="alternate" hreflang="es-ES" href="https://dictionary.cambridge.org/es/diccionario/ingles-chino-tradicional/catch"/>
+ <link rel="alternate" hreflang="es-419" href="https://dictionary.cambridge.org/es-LA/dictionary/english-chinese-traditional/catch"/>
<link rel="alternate" hreflang="ru" href="https://dictionary.cambridge.org/ru/%D1%81%D0%BB%D0%BE%D0%B2%D0%B0%D1%80%D1%8C/%D0%B0%D0%BD%D0%B3%D0%BB%D0%BE-%D0%BA%D0%B8%D1%82%D0%B0%D0%B9%D1%81%D0%BA%D0%B8%D0%B9-%D1%82%D1%80%D0%B0%D0%B4%D0%B8%D1%86%D0%B8%D0%BE%D0%BD%D0%BD%D1%8B%D0%B9/catch"/>
<link rel="alternate" hreflang="pt" href="https://dictionary.cambridge.org/pt/dicionario/ingles-chines-tradicional/catch"/>
<link rel="alternate" hreflang="pt-BR" href="https://dictionary.cambridge.org/pt/dicionario/ingles-chines-tradicional/catch"/>
@@ -33,39 +36,38 @@
<link rel="alternate" hreflang="it" href="https://dictionary.cambridge.org/it/dizionario/inglese-cinese-tradizionale/catch"/>
<link rel="alternate" hreflang="zh-Hans" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%B9%81%E4%BD%93/catch"/>
<link rel="alternate" hreflang="zh-Hant" href="https://dictionary.cambridge.org/zht/%E8%A9%9E%E5%85%B8/%E8%8B%B1%E8%AA%9E-%E6%BC%A2%E8%AA%9E-%E7%B9%81%E9%AB%94/catch"/>
+ <link rel="alternate" hreflang="pl" href="https://dictionary.cambridge.org/pl/dictionary/english-chinese-traditional/catch"/>
<link rel="alternate" hreflang="ko" href="https://dictionary.cambridge.org/ko/%EC%82%AC%EC%A0%84/%EC%98%81%EC%96%B4-%EC%A4%91%EA%B5%AD%EC%96%B4-%EB%B2%88%EC%B2%B4/catch"/>
<link rel="alternate" hreflang="tr" href="https://dictionary.cambridge.org/tr/s%C3%B6zl%C3%BCk/ingilizce-geleneksel-%C3%A7ince/catch"/>
<link rel="alternate" hreflang="ja" href="https://dictionary.cambridge.org/ja/dictionary/english-chinese-traditional/catch"/>
<link rel="alternate" hreflang="vi" href="https://dictionary.cambridge.org/vi/dictionary/english-chinese-traditional/catch"/>
- <link rel="amphtml" href="https://dictionary.cambridge.org/zhs/amp/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%B9%81%E4%BD%93/catch" />
+ <link rel="amphtml" href="https://dictionary.cambridge.org/zhs/amp/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%B9%81%E4%BD%93/catch" />
- <link href="https://dictionary.cambridge.org/zhs/gadgets/%E8%8B%B1%E5%BC%8F%E8%8B%B1%E8%AF%AD/opensearch.xml" title="剑桥在线词典" type="application/opensearchdescription+xml" rel="search"/>
- <meta name="google-site-verification" content="lg0qcRkaLtMeKJcXsOLoptzK-2MIRJzuEtiYHZf_O2Y" />
+ <meta name="google-site-verification" content="lg0qcRkaLtMeKJcXsOLoptzK-2MIRJzuEtiYHZf_O2Y" />
- <link href="/zhs/common.css?version=3.1.126" rel="stylesheet" type="text/css" />
+ <link href="/zhs/common.css?version=4.0.64" rel="stylesheet" type="text/css" />
- <noscript>
- <style>
- .nojs-hide { display: none; }
- </style>
- </noscript>
+ <noscript>
+ <style>
+ .nojs-hide { display: none; }
+ </style>
+ </noscript>
- <link rel="shortcut icon" type="image/x-icon" href="/zhs/external/images/favicon.ico?version=3.1.126"/>
- <link rel="apple-touch-icon-precomposed" type="image/x-icon" href="/zhs/external/images/apple-touch-icon-precomposed.png?version=3.1.126"/>
- <script>
- var dictDefaultList = "english-chinese-simplified;english-chinese-traditional;english;british-grammar";var isAuthenticated = false;
- </script>
- <script type="text/javascript">
- var adsArray = new Array();
- var pageDictCode = "english-chinese-traditional";
+ <link rel="shortcut icon" type="image/x-icon" href="/zhs/external/images/favicon.ico?version=4.0.64"/>
+ <link rel="apple-touch-icon-precomposed" type="image/x-icon" href="/zhs/external/images/apple-touch-icon-precomposed.png?version=4.0.64"/>
- // Remove hash from SocialAuth
- var link = window.location.href;
- if ("replaceState" in history && (/#$/.test(link) || /#_=_$/.test(link))) {
- history.replaceState("", document.title, window.location.pathname + window.location.search);
- }
- </script>
+ <script>var dictDefaultList = "english-chinese-simplified;english-chinese-traditional;english;british-grammar";var isAuthenticated = false;</script>
+ <script type="text/javascript">
+ var adsArray = new Array();
+ var pageDictCode = "english-chinese-traditional";
+
+ // Remove hash from SocialAuth
+ var link = window.location.href;
+ if ("replaceState" in history && (/#$/.test(link) || /#_=_$/.test(link))) {
+ history.replaceState("", document.title, window.location.pathname + window.location.search);
+ }
+ </script>
<script type='text/javascript'>
function readCookie(name) {
@@ -85,206 +87,374 @@
var pl_p = readCookie("pl_p");
</script>
- <script type='text/javascript'>
+
+
+ <script type='text/javascript'>
var pbHdSlots = [
- {code: 'ad_topslot_b', sizes: [728, 90],
- bids: [{ bidder: 'appnexus', params: { placementId: '11654157' }},
+ {code: 'ad_topslot_b', mediaTypes: { banner: { sizes: [728, 90] } },
+ bids: [{ bidder: 'rubicon', params: { accountId: '17282', siteId: '162036', zoneId: '776160' }},
+ { bidder: 'appnexus', params: { placementId: '11654157' }},
+ { bidder: 'ix', params: { siteId: '195466', size: [728, 90] }},
+ { bidder: 'openx', params: { unit: '539971080', delDomain: 'idm-d.openx.net' }},
{ bidder: 'sovrn', params: { tagid: '346693' }},
- { bidder: 'indexExchange', params: { id: '17', siteID: '195466' }},
- { bidder: 'rubicon', params: { accountId: '17282', siteId: '162036', zoneId: '776160' }},
{ bidder: 'aol', params: { placement: '6479710', network: '4832.1', server: 'adserver.adtech.de' }},
{ bidder: 'pulsepoint', params: { cf: '728X90', cp: '561262', ct: '602806' }}]},
- {code: 'ad_leftslot', sizes: [160, 600],
- bids: [{ bidder: 'appnexus', params: { placementId: '11654149' }},
+ {code: 'ad_leftslot', mediaTypes: { banner: { sizes: [160, 600] } },
+ bids: [{ bidder: 'rubicon', params: { accountId: '17282', siteId: '162036', zoneId: '776140' }},
+ { bidder: 'appnexus', params: { placementId: '11654149' }},
+ { bidder: 'ix', params: { siteId: '195464', size: [160, 600] }},
+ { bidder: 'openx', params: { unit: '539971066', delDomain: 'idm-d.openx.net' }},
{ bidder: 'sovrn', params: { tagid: '346698' }},
- { bidder: 'indexExchange', params: { id: '3', siteID: '195464' }},
- { bidder: 'rubicon', params: { accountId: '17282', siteId: '162036', zoneId: '776140' }},
{ bidder: 'aol', params: { placement: '6479703', network: '4832.1', server: 'adserver.adtech.de' }},
{ bidder: 'pulsepoint', params: { cf: '160X600', cp: '561262', ct: '602779' }}]},
- {code: 'ad_btmslot_a', sizes: [300, 250],
- bids: [{ bidder: 'appnexus', params: { placementId: '11653860' }},
+ {code: 'ad_btmslot_a', mediaTypes: { banner: { sizes: [[300, 250]] } },
+ bids: [{ bidder: 'rubicon', params: { accountId: '17282', siteId: '162036', zoneId: '776130' }},
+ { bidder: 'appnexus', params: { placementId: '11653860' }},
+ { bidder: 'ix', params: { siteId: '194852', size: [300, 250] }},
+ { bidder: 'openx', params: { unit: '539971063', delDomain: 'idm-d.openx.net' }},
{ bidder: 'sovrn', params: { tagid: '346688' }},
- { bidder: 'indexExchange', params: { id: '1', siteID: '194852' }},
- { bidder: 'rubicon', params: { accountId: '17282', siteId: '162036', zoneId: '776130' }},
{ bidder: 'aol', params: { placement: '6479718', network: '4832.1', server: 'adserver.adtech.de' }},
{ bidder: 'pulsepoint', params: { cf: '300X250', cp: '561262', ct: '602775' }}]},
- {code: 'ad_rightslot', sizes: [300, 250],
- bids: [{ bidder: 'appnexus', params: { placementId: '11654156' }},
+ {code: 'ad_rightslot', mediaTypes: { banner: { sizes: [300, 250] } },
+ bids: [{ bidder: 'rubicon', params: { accountId: '17282', siteId: '162036', zoneId: '776156' }},
+ { bidder: 'appnexus', params: { placementId: '11654156' }},
+ { bidder: 'ix', params: { siteId: '195465', size: [300, 250] }},
+ { bidder: 'openx', params: { unit: '539971079', delDomain: 'idm-d.openx.net' }},
{ bidder: 'sovrn', params: { tagid: '387232' }},
- { bidder: 'indexExchange', params: { id: '16', siteID: '195465' }},
- { bidder: 'rubicon', params: { accountId: '17282', siteId: '162036', zoneId: '776156' }},
{ bidder: 'aol', params: { placement: '6479700', network: '4832.1', server: 'adserver.adtech.de' }},
{ bidder: 'pulsepoint', params: { cf: '300X250', cp: '561262', ct: '602805' }}]},
- {code: 'ad_contentslot_1', sizes: [300, 250],
- bids: [{ bidder: 'appnexus', params: { placementId: '11654150' }},
+ {code: 'ad_contentslot_1', mediaTypes: { banner: { sizes: [[300, 250], [336, 280]] } },
+ bids: [{ bidder: 'rubicon', params: { accountId: '17282', siteId: '162036', zoneId: '776142' }},
+ { bidder: 'appnexus', params: { placementId: '11654150' }},
+ { bidder: 'ix', params: { siteId: '195452', size: [300, 250] }},
+ { bidder: 'ix', params: { siteId: '195452', size: [336, 280] }},
+ { bidder: 'openx', params: { unit: '539971067', delDomain: 'idm-d.openx.net' }},
{ bidder: 'sovrn', params: { tagid: '446383' }},
- { bidder: 'indexExchange', params: { id: '4', siteID: '195452' }},
- { bidder: 'rubicon', params: { accountId: '17282', siteId: '162036', zoneId: '776142' }},
{ bidder: 'aol', params: { placement: '6479707', network: '4832.1', server: 'adserver.adtech.de' }},
- { bidder: 'pulsepoint', params: { cf: '300X250', cp: '561262', ct: '602780' }}]},
- {code: 'ad_contentslot_2', sizes: [300, 250],
- bids: [{ bidder: 'appnexus', params: { placementId: '11654151' }},
+ { bidder: 'aol', params: { placement: '6623862', network: '4832.1', server: 'adserver.adtech.de' }},
+ { bidder: 'pulsepoint', params: { cf: '300X250', cp: '561262', ct: '602780' }},
+ { bidder: 'pulsepoint', params: { cf: '336X280', cp: '561262', ct: '661201' }}]},
+ {code: 'ad_contentslot_2', mediaTypes: { banner: { sizes: [[300, 250], [336, 280]] } },
+ bids: [{ bidder: 'rubicon', params: { accountId: '17282', siteId: '162036', zoneId: '776144' }},
+ { bidder: 'appnexus', params: { placementId: '11654151' }},
+ { bidder: 'ix', params: { siteId: '195454', size: [300, 250] }},
+ { bidder: 'ix', params: { siteId: '195454', size: [336, 280] }},
+ { bidder: 'openx', params: { unit: '539971069', delDomain: 'idm-d.openx.net' }},
{ bidder: 'sovrn', params: { tagid: '448834' }},
- { bidder: 'indexExchange', params: { id: '6', siteID: '195454' }},
- { bidder: 'rubicon', params: { accountId: '17282', siteId: '162036', zoneId: '776144' }},
{ bidder: 'aol', params: { placement: '6479711', network: '4832.1', server: 'adserver.adtech.de' }},
- { bidder: 'pulsepoint', params: { cf: '300X250', cp: '561262', ct: '602784' }}]},
- {code: 'ad_contentslot_3', sizes: [300, 250],
- bids: [{ bidder: 'appnexus', params: { placementId: '11654152' }},
+ { bidder: 'aol', params: { placement: '6623860', network: '4832.1', server: 'adserver.adtech.de' }},
+ { bidder: 'pulsepoint', params: { cf: '300X250', cp: '561262', ct: '602784' }},
+ { bidder: 'pulsepoint', params: { cf: '336X280', cp: '561262', ct: '661202' }}]},
+ {code: 'ad_contentslot_3', mediaTypes: { banner: { sizes: [[300, 250], [336, 280]] } },
+ bids: [{ bidder: 'rubicon', params: { accountId: '17282', siteId: '162036', zoneId: '776146' }},
+ { bidder: 'appnexus', params: { placementId: '11654152' }},
+ { bidder: 'ix', params: { siteId: '195456', size: [300, 250] }},
+ { bidder: 'ix', params: { siteId: '195456', size: [336, 280] }},
+ { bidder: 'openx', params: { unit: '539971071', delDomain: 'idm-d.openx.net' }},
{ bidder: 'sovrn', params: { tagid: '448837' }},
- { bidder: 'indexExchange', params: { id: '8', siteID: '195456' }},
- { bidder: 'rubicon', params: { accountId: '17282', siteId: '162036', zoneId: '776146' }},
{ bidder: 'aol', params: { placement: '6479725', network: '4832.1', server: 'adserver.adtech.de' }},
- { bidder: 'pulsepoint', params: { cf: '300X250', cp: '561262', ct: '602788' }}]}];
+ { bidder: 'aol', params: { placement: '6623861', network: '4832.1', server: 'adserver.adtech.de' }},
+ { bidder: 'pulsepoint', params: { cf: '300X250', cp: '561262', ct: '602788' }},
+ { bidder: 'pulsepoint', params: { cf: '336X280', cp: '561262', ct: '661203' }}]},
+ {code: 'ad_contentslot_4', mediaTypes: { banner: { sizes: [[300, 250], [336, 280]] } },
+ bids: [{ bidder: 'rubicon', params: { accountId: '17282', siteId: '162036', zoneId: '776148' }},
+ { bidder: 'appnexus', params: { placementId: '11654153' }},
+ { bidder: 'ix', params: { siteId: '195458', size: [300, 250] }},
+ { bidder: 'ix', params: { siteId: '195458', size: [336, 280] }},
+ { bidder: 'openx', params: { unit: '539971073', delDomain: 'idm-d.openx.net' }},
+ { bidder: 'sovrn', params: { tagid: '448840' }},
+ { bidder: 'aol', params: { placement: '6479702', network: '4832.1', server: 'adserver.adtech.de' }},
+ { bidder: 'aol', params: { placement: '6623865', network: '4832.1', server: 'adserver.adtech.de' }},
+ { bidder: 'pulsepoint', params: { cf: '300X250', cp: '561262', ct: '602792' }},
+ { bidder: 'pulsepoint', params: { cf: '336X280', cp: '561262', ct: '661204' }}]},
+ {code: 'ad_contentslot_5', mediaTypes: { banner: { sizes: [[300, 250], [336, 280]] } },
+ bids: [{ bidder: 'rubicon', params: { accountId: '17282', siteId: '162036', zoneId: '776150' }},
+ { bidder: 'appnexus', params: { placementId: '11654154' }},
+ { bidder: 'ix', params: { siteId: '195460', size: [300, 250] }},
+ { bidder: 'ix', params: { siteId: '195460', size: [336, 280] }},
+ { bidder: 'openx', params: { unit: '539971075', delDomain: 'idm-d.openx.net' }},
+ { bidder: 'sovrn', params: { tagid: '448843' }},
+ { bidder: 'aol', params: { placement: '6479695', network: '4832.1', server: 'adserver.adtech.de' }},
+ { bidder: 'aol', params: { placement: '6623863', network: '4832.1', server: 'adserver.adtech.de' }},
+ { bidder: 'pulsepoint', params: { cf: '300X250', cp: '561262', ct: '602797' }},
+ { bidder: 'pulsepoint', params: { cf: '336X280', cp: '561262', ct: '661205' }}]}];
var pbDesktopSlots = [
- {code: 'ad_topslot_b', sizes: [728, 90],
- bids: [{ bidder: 'appnexus', params: { placementId: '11654157' }},
+ {code: 'ad_topslot_b', mediaTypes: { banner: { sizes: [728, 90] } },
+ bids: [{ bidder: 'rubicon', params: { accountId: '17282', siteId: '162036', zoneId: '776160' }},
+ { bidder: 'appnexus', params: { placementId: '11654157' }},
+ { bidder: 'ix', params: { siteId: '195466', size: [728, 90] }},
+ { bidder: 'openx', params: { unit: '539971080', delDomain: 'idm-d.openx.net' }},
{ bidder: 'sovrn', params: { tagid: '346693' }},
- { bidder: 'indexExchange', params: { id: '17', siteID: '195466' }},
- { bidder: 'rubicon', params: { accountId: '17282', siteId: '162036', zoneId: '776160' }},
{ bidder: 'aol', params: { placement: '6479710', network: '4832.1', server: 'adserver.adtech.de' }},
{ bidder: 'pulsepoint', params: { cf: '728X90', cp: '561262', ct: '602806' }}]},
- {code: 'ad_leftslot', sizes: [160, 600],
- bids: [{ bidder: 'appnexus', params: { placementId: '11654149' }},
+ {code: 'ad_leftslot', mediaTypes: { banner: { sizes: [160, 600] } },
+ bids: [{ bidder: 'rubicon', params: { accountId: '17282', siteId: '162036', zoneId: '776140' }},
+ { bidder: 'appnexus', params: { placementId: '11654149' }},
+ { bidder: 'ix', params: { siteId: '195464', size: [160, 600] }},
+ { bidder: 'openx', params: { unit: '539971066', delDomain: 'idm-d.openx.net' }},
{ bidder: 'sovrn', params: { tagid: '346698' }},
- { bidder: 'indexExchange', params: { id: '3', siteID: '195464' }},
- { bidder: 'rubicon', params: { accountId: '17282', siteId: '162036', zoneId: '776140' }},
{ bidder: 'aol', params: { placement: '6479703', network: '4832.1', server: 'adserver.adtech.de' }},
{ bidder: 'pulsepoint', params: { cf: '160X600', cp: '561262', ct: '602779' }}]},
- {code: 'ad_btmslot_a', sizes: [300, 250],
- bids: [{ bidder: 'appnexus', params: { placementId: '11653860' }},
+ {code: 'ad_btmslot_a', mediaTypes: { banner: { sizes: [[300, 250]] } },
+ bids: [{ bidder: 'rubicon', params: { accountId: '17282', siteId: '162036', zoneId: '776130' }},
+ { bidder: 'appnexus', params: { placementId: '11653860' }},
+ { bidder: 'ix', params: { siteId: '194852', size: [300, 250] }},
+ { bidder: 'openx', params: { unit: '539971063', delDomain: 'idm-d.openx.net' }},
{ bidder: 'sovrn', params: { tagid: '346688' }},
- { bidder: 'indexExchange', params: { id: '1', siteID: '194852' }},
- { bidder: 'rubicon', params: { accountId: '17282', siteId: '162036', zoneId: '776130' }},
{ bidder: 'aol', params: { placement: '6479718', network: '4832.1', server: 'adserver.adtech.de' }},
{ bidder: 'pulsepoint', params: { cf: '300X250', cp: '561262', ct: '602775' }}]},
- {code: 'ad_rightslot', sizes: [300, 250],
- bids: [{ bidder: 'appnexus', params: { placementId: '11654156' }},
+ {code: 'ad_rightslot', mediaTypes: { banner: { sizes: [300, 250] } },
+ bids: [{ bidder: 'rubicon', params: { accountId: '17282', siteId: '162036', zoneId: '776156' }},
+ { bidder: 'appnexus', params: { placementId: '11654156' }},
+ { bidder: 'ix', params: { siteId: '195465', size: [300, 250] }},
+ { bidder: 'openx', params: { unit: '539971079', delDomain: 'idm-d.openx.net' }},
{ bidder: 'sovrn', params: { tagid: '387232' }},
- { bidder: 'indexExchange', params: { id: '16', siteID: '195465' }},
- { bidder: 'rubicon', params: { accountId: '17282', siteId: '162036', zoneId: '776156' }},
{ bidder: 'aol', params: { placement: '6479700', network: '4832.1', server: 'adserver.adtech.de' }},
{ bidder: 'pulsepoint', params: { cf: '300X250', cp: '561262', ct: '602805' }}]},
- {code: 'ad_contentslot_1', sizes: [300, 250],
- bids: [{ bidder: 'appnexus', params: { placementId: '11654150' }},
+ {code: 'ad_contentslot_1', mediaTypes: { banner: { sizes: [[300, 250], [336, 280]] } },
+ bids: [{ bidder: 'rubicon', params: { accountId: '17282', siteId: '162036', zoneId: '776142' }},
+ { bidder: 'appnexus', params: { placementId: '11654150' }},
+ { bidder: 'ix', params: { siteId: '195452', size: [300, 250] }},
+ { bidder: 'ix', params: { siteId: '195452', size: [336, 280] }},
+ { bidder: 'openx', params: { unit: '539971067', delDomain: 'idm-d.openx.net' }},
{ bidder: 'sovrn', params: { tagid: '446383' }},
- { bidder: 'indexExchange', params: { id: '4', siteID: '195452' }},
- { bidder: 'rubicon', params: { accountId: '17282', siteId: '162036', zoneId: '776142' }},
{ bidder: 'aol', params: { placement: '6479707', network: '4832.1', server: 'adserver.adtech.de' }},
- { bidder: 'pulsepoint', params: { cf: '300X250', cp: '561262', ct: '602780' }}]},
- {code: 'ad_contentslot_2', sizes: [300, 250],
- bids: [{ bidder: 'appnexus', params: { placementId: '11654151' }},
+ { bidder: 'aol', params: { placement: '6623862', network: '4832.1', server: 'adserver.adtech.de' }},
+ { bidder: 'pulsepoint', params: { cf: '300X250', cp: '561262', ct: '602780' }},
+ { bidder: 'pulsepoint', params: { cf: '336X280', cp: '561262', ct: '661201' }}]},
+ {code: 'ad_contentslot_2', mediaTypes: { banner: { sizes: [[300, 250], [336, 280]] } },
+ bids: [{ bidder: 'rubicon', params: { accountId: '17282', siteId: '162036', zoneId: '776144' }},
+ { bidder: 'appnexus', params: { placementId: '11654151' }},
+ { bidder: 'ix', params: { siteId: '195454', size: [300, 250] }},
+ { bidder: 'ix', params: { siteId: '195454', size: [336, 280] }},
+ { bidder: 'openx', params: { unit: '539971069', delDomain: 'idm-d.openx.net' }},
{ bidder: 'sovrn', params: { tagid: '448834' }},
- { bidder: 'indexExchange', params: { id: '6', siteID: '195454' }},
- { bidder: 'rubicon', params: { accountId: '17282', siteId: '162036', zoneId: '776144' }},
{ bidder: 'aol', params: { placement: '6479711', network: '4832.1', server: 'adserver.adtech.de' }},
- { bidder: 'pulsepoint', params: { cf: '300X250', cp: '561262', ct: '602784' }}]},
- {code: 'ad_contentslot_3', sizes: [300, 250],
- bids: [{ bidder: 'appnexus', params: { placementId: '11654152' }},
+ { bidder: 'aol', params: { placement: '6623860', network: '4832.1', server: 'adserver.adtech.de' }},
+ { bidder: 'pulsepoint', params: { cf: '300X250', cp: '561262', ct: '602784' }},
+ { bidder: 'pulsepoint', params: { cf: '336X280', cp: '561262', ct: '661202' }}]},
+ {code: 'ad_contentslot_3', mediaTypes: { banner: { sizes: [[300, 250], [336, 280]] } },
+ bids: [{ bidder: 'rubicon', params: { accountId: '17282', siteId: '162036', zoneId: '776146' }},
+ { bidder: 'appnexus', params: { placementId: '11654152' }},
+ { bidder: 'ix', params: { siteId: '195456', size: [300, 250] }},
+ { bidder: 'ix', params: { siteId: '195456', size: [336, 280] }},
+ { bidder: 'openx', params: { unit: '539971071', delDomain: 'idm-d.openx.net' }},
{ bidder: 'sovrn', params: { tagid: '448837' }},
- { bidder: 'indexExchange', params: { id: '8', siteID: '195456' }},
- { bidder: 'rubicon', params: { accountId: '17282', siteId: '162036', zoneId: '776146' }},
{ bidder: 'aol', params: { placement: '6479725', network: '4832.1', server: 'adserver.adtech.de' }},
- { bidder: 'pulsepoint', params: { cf: '300X250', cp: '561262', ct: '602788' }}]}];
+ { bidder: 'aol', params: { placement: '6623861', network: '4832.1', server: 'adserver.adtech.de' }},
+ { bidder: 'pulsepoint', params: { cf: '300X250', cp: '561262', ct: '602788' }},
+ { bidder: 'pulsepoint', params: { cf: '336X280', cp: '561262', ct: '661203' }}]},
+ {code: 'ad_contentslot_4', mediaTypes: { banner: { sizes: [[300, 250], [336, 280]] } },
+ bids: [{ bidder: 'rubicon', params: { accountId: '17282', siteId: '162036', zoneId: '776148' }},
+ { bidder: 'appnexus', params: { placementId: '11654153' }},
+ { bidder: 'ix', params: { siteId: '195458', size: [300, 250] }},
+ { bidder: 'ix', params: { siteId: '195458', size: [336, 280] }},
+ { bidder: 'openx', params: { unit: '539971073', delDomain: 'idm-d.openx.net' }},
+ { bidder: 'sovrn', params: { tagid: '448840' }},
+ { bidder: 'aol', params: { placement: '6479702', network: '4832.1', server: 'adserver.adtech.de' }},
+ { bidder: 'aol', params: { placement: '6623865', network: '4832.1', server: 'adserver.adtech.de' }},
+ { bidder: 'pulsepoint', params: { cf: '300X250', cp: '561262', ct: '602792' }},
+ { bidder: 'pulsepoint', params: { cf: '336X280', cp: '561262', ct: '661204' }}]},
+ {code: 'ad_contentslot_5', mediaTypes: { banner: { sizes: [[300, 250], [336, 280]] } },
+ bids: [{ bidder: 'rubicon', params: { accountId: '17282', siteId: '162036', zoneId: '776150' }},
+ { bidder: 'appnexus', params: { placementId: '11654154' }},
+ { bidder: 'ix', params: { siteId: '195460', size: [300, 250] }},
+ { bidder: 'ix', params: { siteId: '195460', size: [336, 280] }},
+ { bidder: 'openx', params: { unit: '539971075', delDomain: 'idm-d.openx.net' }},
+ { bidder: 'sovrn', params: { tagid: '448843' }},
+ { bidder: 'aol', params: { placement: '6479695', network: '4832.1', server: 'adserver.adtech.de' }},
+ { bidder: 'aol', params: { placement: '6623863', network: '4832.1', server: 'adserver.adtech.de' }},
+ { bidder: 'pulsepoint', params: { cf: '300X250', cp: '561262', ct: '602797' }},
+ { bidder: 'pulsepoint', params: { cf: '336X280', cp: '561262', ct: '661205' }}]}];
var pbTabletSlots = [
- {code: 'ad_topslot_b', sizes: [728, 90],
- bids: [{ bidder: 'appnexus', params: { placementId: '11654157' }},
+ {code: 'ad_topslot_b', mediaTypes: { banner: { sizes: [728, 90] } },
+ bids: [{ bidder: 'rubicon', params: { accountId: '17282', siteId: '162036', zoneId: '776160' }},
+ { bidder: 'appnexus', params: { placementId: '11654157' }},
+ { bidder: 'ix', params: { siteId: '195466', size: [728, 90] }},
+ { bidder: 'openx', params: { unit: '539971080', delDomain: 'idm-d.openx.net' }},
{ bidder: 'sovrn', params: { tagid: '346693' }},
- { bidder: 'indexExchange', params: { id: '17', siteID: '195466' }},
- { bidder: 'rubicon', params: { accountId: '17282', siteId: '162036', zoneId: '776160' }},
{ bidder: 'aol', params: { placement: '6479710', network: '4832.1', server: 'adserver.adtech.de' }},
{ bidder: 'pulsepoint', params: { cf: '728X90', cp: '561262', ct: '602806' }}]},
- {code: 'ad_btmslot_a', sizes: [300, 250],
- bids: [{ bidder: 'appnexus', params: { placementId: '11653860' }},
+ {code: 'ad_btmslot_a', mediaTypes: { banner: { sizes: [[300, 250]] } },
+ bids: [{ bidder: 'rubicon', params: { accountId: '17282', siteId: '162036', zoneId: '776130' }},
+ { bidder: 'appnexus', params: { placementId: '11653860' }},
+ { bidder: 'ix', params: { siteId: '194852', size: [300, 250] }},
+ { bidder: 'openx', params: { unit: '539971063', delDomain: 'idm-d.openx.net' }},
{ bidder: 'sovrn', params: { tagid: '346688' }},
- { bidder: 'indexExchange', params: { id: '1', siteID: '194852' }},
- { bidder: 'rubicon', params: { accountId: '17282', siteId: '162036', zoneId: '776130' }},
{ bidder: 'aol', params: { placement: '6479718', network: '4832.1', server: 'adserver.adtech.de' }},
{ bidder: 'pulsepoint', params: { cf: '300X250', cp: '561262', ct: '602775' }}]},
- {code: 'ad_rightslot', sizes: [300, 250],
- bids: [{ bidder: 'appnexus', params: { placementId: '11654156' }},
+ {code: 'ad_rightslot', mediaTypes: { banner: { sizes: [300, 250] } },
+ bids: [{ bidder: 'rubicon', params: { accountId: '17282', siteId: '162036', zoneId: '776156' }},
+ { bidder: 'appnexus', params: { placementId: '11654156' }},
+ { bidder: 'ix', params: { siteId: '195465', size: [300, 250] }},
+ { bidder: 'openx', params: { unit: '539971079', delDomain: 'idm-d.openx.net' }},
{ bidder: 'sovrn', params: { tagid: '387232' }},
- { bidder: 'indexExchange', params: { id: '16', siteID: '195465' }},
- { bidder: 'rubicon', params: { accountId: '17282', siteId: '162036', zoneId: '776156' }},
{ bidder: 'aol', params: { placement: '6479700', network: '4832.1', server: 'adserver.adtech.de' }},
{ bidder: 'pulsepoint', params: { cf: '300X250', cp: '561262', ct: '602805' }}]},
- {code: 'ad_contentslot_1', sizes: [300, 250],
- bids: [{ bidder: 'appnexus', params: { placementId: '11654150' }},
+ {code: 'ad_contentslot_1', mediaTypes: { banner: { sizes: [[300, 250], [336, 280]] } },
+ bids: [{ bidder: 'rubicon', params: { accountId: '17282', siteId: '162036', zoneId: '776142' }},
+ { bidder: 'appnexus', params: { placementId: '11654150' }},
+ { bidder: 'ix', params: { siteId: '195452', size: [300, 250] }},
+ { bidder: 'ix', params: { siteId: '195452', size: [336, 280] }},
+ { bidder: 'openx', params: { unit: '539971067', delDomain: 'idm-d.openx.net' }},
{ bidder: 'sovrn', params: { tagid: '446383' }},
- { bidder: 'indexExchange', params: { id: '4', siteID: '195452' }},
- { bidder: 'rubicon', params: { accountId: '17282', siteId: '162036', zoneId: '776142' }},
{ bidder: 'aol', params: { placement: '6479707', network: '4832.1', server: 'adserver.adtech.de' }},
- { bidder: 'pulsepoint', params: { cf: '300X250', cp: '561262', ct: '602780' }}]},
- {code: 'ad_contentslot_2', sizes: [300, 250],
- bids: [{ bidder: 'appnexus', params: { placementId: '11654151' }},
+ { bidder: 'aol', params: { placement: '6623862', network: '4832.1', server: 'adserver.adtech.de' }},
+ { bidder: 'pulsepoint', params: { cf: '300X250', cp: '561262', ct: '602780' }},
+ { bidder: 'pulsepoint', params: { cf: '336X280', cp: '561262', ct: '661201' }}]},
+ {code: 'ad_contentslot_2', mediaTypes: { banner: { sizes: [[300, 250], [336, 280]] } },
+ bids: [{ bidder: 'rubicon', params: { accountId: '17282', siteId: '162036', zoneId: '776144' }},
+ { bidder: 'appnexus', params: { placementId: '11654151' }},
+ { bidder: 'ix', params: { siteId: '195454', size: [300, 250] }},
+ { bidder: 'ix', params: { siteId: '195454', size: [336, 280] }},
+ { bidder: 'openx', params: { unit: '539971069', delDomain: 'idm-d.openx.net' }},
{ bidder: 'sovrn', params: { tagid: '448834' }},
- { bidder: 'indexExchange', params: { id: '6', siteID: '195454' }},
- { bidder: 'rubicon', params: { accountId: '17282', siteId: '162036', zoneId: '776144' }},
{ bidder: 'aol', params: { placement: '6479711', network: '4832.1', server: 'adserver.adtech.de' }},
- { bidder: 'pulsepoint', params: { cf: '300X250', cp: '561262', ct: '602784' }}]},
- {code: 'ad_contentslot_3', sizes: [300, 250],
- bids: [{ bidder: 'appnexus', params: { placementId: '11654152' }},
+ { bidder: 'aol', params: { placement: '6623860', network: '4832.1', server: 'adserver.adtech.de' }},
+ { bidder: 'pulsepoint', params: { cf: '300X250', cp: '561262', ct: '602784' }},
+ { bidder: 'pulsepoint', params: { cf: '336X280', cp: '561262', ct: '661202' }}]},
+ {code: 'ad_contentslot_3', mediaTypes: { banner: { sizes: [[300, 250], [336, 280]] } },
+ bids: [{ bidder: 'rubicon', params: { accountId: '17282', siteId: '162036', zoneId: '776146' }},
+ { bidder: 'appnexus', params: { placementId: '11654152' }},
+ { bidder: 'ix', params: { siteId: '195456', size: [300, 250] }},
+ { bidder: 'ix', params: { siteId: '195456', size: [336, 280] }},
+ { bidder: 'openx', params: { unit: '539971071', delDomain: 'idm-d.openx.net' }},
{ bidder: 'sovrn', params: { tagid: '448837' }},
- { bidder: 'indexExchange', params: { id: '8', siteID: '195456' }},
- { bidder: 'rubicon', params: { accountId: '17282', siteId: '162036', zoneId: '776146' }},
{ bidder: 'aol', params: { placement: '6479725', network: '4832.1', server: 'adserver.adtech.de' }},
- { bidder: 'pulsepoint', params: { cf: '300X250', cp: '561262', ct: '602788' }}]}];
+ { bidder: 'aol', params: { placement: '6623861', network: '4832.1', server: 'adserver.adtech.de' }},
+ { bidder: 'pulsepoint', params: { cf: '300X250', cp: '561262', ct: '602788' }},
+ { bidder: 'pulsepoint', params: { cf: '336X280', cp: '561262', ct: '661203' }}]},
+ {code: 'ad_contentslot_4', mediaTypes: { banner: { sizes: [[300, 250], [336, 280]] } },
+ bids: [{ bidder: 'rubicon', params: { accountId: '17282', siteId: '162036', zoneId: '776148' }},
+ { bidder: 'appnexus', params: { placementId: '11654153' }},
+ { bidder: 'ix', params: { siteId: '195458', size: [300, 250] }},
+ { bidder: 'ix', params: { siteId: '195458', size: [336, 280] }},
+ { bidder: 'openx', params: { unit: '539971073', delDomain: 'idm-d.openx.net' }},
+ { bidder: 'sovrn', params: { tagid: '448840' }},
+ { bidder: 'aol', params: { placement: '6479702', network: '4832.1', server: 'adserver.adtech.de' }},
+ { bidder: 'aol', params: { placement: '6623865', network: '4832.1', server: 'adserver.adtech.de' }},
+ { bidder: 'pulsepoint', params: { cf: '300X250', cp: '561262', ct: '602792' }},
+ { bidder: 'pulsepoint', params: { cf: '336X280', cp: '561262', ct: '661204' }}]},
+ {code: 'ad_contentslot_5', mediaTypes: { banner: { sizes: [[300, 250], [336, 280]] } },
+ bids: [{ bidder: 'rubicon', params: { accountId: '17282', siteId: '162036', zoneId: '776150' }},
+ { bidder: 'appnexus', params: { placementId: '11654154' }},
+ { bidder: 'ix', params: { siteId: '195460', size: [300, 250] }},
+ { bidder: 'ix', params: { siteId: '195460', size: [336, 280] }},
+ { bidder: 'openx', params: { unit: '539971075', delDomain: 'idm-d.openx.net' }},
+ { bidder: 'sovrn', params: { tagid: '448843' }},
+ { bidder: 'aol', params: { placement: '6479695', network: '4832.1', server: 'adserver.adtech.de' }},
+ { bidder: 'aol', params: { placement: '6623863', network: '4832.1', server: 'adserver.adtech.de' }},
+ { bidder: 'pulsepoint', params: { cf: '300X250', cp: '561262', ct: '602797' }},
+ { bidder: 'pulsepoint', params: { cf: '336X280', cp: '561262', ct: '661205' }}]}];
var pbMobileSlots = [
- {code: 'ad_topslot_a', sizes: [320, 50],
- bids: [{ bidder: 'appnexus', params: { placementId: '11654208' }},
+ {code: 'ad_topslot_a', mediaTypes: { banner: { sizes: [320, 50] } },
+ bids: [{ bidder: 'rubicon', params: { accountId: '17282', siteId: '162050', zoneId: '776358' }},
+ { bidder: 'appnexus', params: { placementId: '11654208' }},
+ { bidder: 'ix', params: { siteId: '195467', size: [320, 50] }},
+ { bidder: 'openx', params: { unit: '539971081', delDomain: 'idm-d.openx.net' }},
{ bidder: 'sovrn', params: { tagid: '387233' }},
- { bidder: 'indexExchange', params: { id: '18', siteID: '195467' }},
- { bidder: 'rubicon', params: { accountId: '17282', siteId: '162050', zoneId: '776358' }},
{ bidder: 'aol', params: { placement: '6479701', network: '4832.1', server: 'adserver.adtech.de' }},
{ bidder: 'pulsepoint', params: { cf: '300X250', cp: '561262', ct: '602807' }}]},
- {code: 'ad_btmslot_a', sizes: [[300, 250], [320, 50], [300, 50]],
- bids: [{ bidder: 'appnexus', params: { placementId: '11654174' }},
+ {code: 'ad_btmslot_a', mediaTypes: { banner: { sizes: [[300, 250], [320, 50], [300, 50]] } },
+ bids: [{ bidder: 'rubicon', params: { accountId: '17282', siteId: '162050', zoneId: '776336' }},
+ { bidder: 'appnexus', params: { placementId: '11654174' }},
+ { bidder: 'ix', params: { siteId: '195451', size: [300, 250] }},
+ { bidder: 'ix', params: { siteId: '195451', size: [320, 50] }},
+ { bidder: 'ix', params: { siteId: '195451', size: [300, 50] }},
+ { bidder: 'openx', params: { unit: '539971065', delDomain: 'idm-d.openx.net' }},
{ bidder: 'sovrn', params: { tagid: '446381' }},
{ bidder: 'sovrn', params: { tagid: '446382' }},
- { bidder: 'indexExchange', params: { id: '2', siteID: '195451' }},
- { bidder: 'rubicon', params: { accountId: '17282', siteId: '162050', zoneId: '776336' }},
{ bidder: 'aol', params: { placement: '6479709', network: '4832.1', server: 'adserver.adtech.de' }},
{ bidder: 'aol', params: { placement: '6479722', network: '4832.1', server: 'adserver.adtech.de' }},
{ bidder: 'aol', params: { placement: '6479720', network: '4832.1', server: 'adserver.adtech.de' }},
{ bidder: 'pulsepoint', params: { cf: '300X250', cp: '561262', ct: '602776' }},
{ bidder: 'pulsepoint', params: { cf: '300X50', cp: '561262', ct: '602777' }},
{ bidder: 'pulsepoint', params: { cf: '320X50', cp: '561262', ct: '602778' }}]},
- {code: 'ad_contentslot_1', sizes: [[300, 250], [320, 50], [300, 50]],
- bids: [{ bidder: 'appnexus', params: { placementId: '11654189' }},
+ {code: 'ad_contentslot_1', mediaTypes: { banner: { sizes: [[300, 250], [320, 100], [320, 50], [300, 50]] } },
+ bids: [{ bidder: 'rubicon', params: { accountId: '17282', siteId: '162050', zoneId: '776338' }},
+ { bidder: 'appnexus', params: { placementId: '11654189' }},
+ { bidder: 'ix', params: { siteId: '195453', size: [300, 250] }},
+ { bidder: 'ix', params: { siteId: '195453', size: [320, 100] }},
+ { bidder: 'ix', params: { siteId: '195453', size: [320, 50] }},
+ { bidder: 'ix', params: { siteId: '195453', size: [300, 50] }},
+ { bidder: 'openx', params: { unit: '539971068', delDomain: 'idm-d.openx.net' }},
{ bidder: 'sovrn', params: { tagid: '446385' }},
{ bidder: 'sovrn', params: { tagid: '446384' }},
- { bidder: 'indexExchange', params: { id: '5', siteID: '195453' }},
- { bidder: 'rubicon', params: { accountId: '17282', siteId: '162050', zoneId: '776338' }},
{ bidder: 'aol', params: { placement: '6479724', network: '4832.1', server: 'adserver.adtech.de' }},
{ bidder: 'aol', params: { placement: '6479694', network: '4832.1', server: 'adserver.adtech.de' }},
{ bidder: 'aol', params: { placement: '6479699', network: '4832.1', server: 'adserver.adtech.de' }},
{ bidder: 'pulsepoint', params: { cf: '300X250', cp: '561262', ct: '602781' }},
{ bidder: 'pulsepoint', params: { cf: '300X50', cp: '561262', ct: '602782' }},
+ { bidder: 'pulsepoint', params: { cf: '320X100', cp: '561262', ct: '661195' }},
{ bidder: 'pulsepoint', params: { cf: '320X50', cp: '561262', ct: '602783' }}]},
- {code: 'ad_contentslot_2', sizes: [[300, 250], [320, 50], [300, 50]],
- bids: [{ bidder: 'appnexus', params: { placementId: '11654192' }},
+ {code: 'ad_contentslot_2', mediaTypes: { banner: { sizes: [[300, 250], [320, 100], [320, 50], [300, 50]] } },
+ bids: [{ bidder: 'rubicon', params: { accountId: '17282', siteId: '162050', zoneId: '776340' }},
+ { bidder: 'appnexus', params: { placementId: '11654192' }},
+ { bidder: 'ix', params: { siteId: '195455', size: [300, 250] }},
+ { bidder: 'ix', params: { siteId: '195455', size: [320, 100] }},
+ { bidder: 'ix', params: { siteId: '195455', size: [320, 50] }},
+ { bidder: 'ix', params: { siteId: '195455', size: [300, 50] }},
+ { bidder: 'openx', params: { unit: '539971070', delDomain: 'idm-d.openx.net' }},
{ bidder: 'sovrn', params: { tagid: '448836' }},
{ bidder: 'sovrn', params: { tagid: '448835' }},
- { bidder: 'indexExchange', params: { id: '7', siteID: '195455' }},
- { bidder: 'rubicon', params: { accountId: '17282', siteId: '162050', zoneId: '776340' }},
{ bidder: 'aol', params: { placement: '6479708', network: '4832.1', server: 'adserver.adtech.de' }},
{ bidder: 'aol', params: { placement: '6479716', network: '4832.1', server: 'adserver.adtech.de' }},
{ bidder: 'aol', params: { placement: '6479705', network: '4832.1', server: 'adserver.adtech.de' }},
{ bidder: 'pulsepoint', params: { cf: '300X250', cp: '561262', ct: '602785' }},
{ bidder: 'pulsepoint', params: { cf: '300X50', cp: '561262', ct: '602786' }},
+ { bidder: 'pulsepoint', params: { cf: '320X100', cp: '561262', ct: '661196' }},
{ bidder: 'pulsepoint', params: { cf: '320X50', cp: '561262', ct: '602787' }}]},
- {code: 'ad_contentslot_3', sizes: [[300, 250], [320, 50], [300, 50]],
- bids: [{ bidder: 'appnexus', params: { placementId: '11654195' }},
+ {code: 'ad_contentslot_3', mediaTypes: { banner: { sizes: [[300, 250], [320, 100], [320, 50], [300, 50]] } },
+ bids: [{ bidder: 'rubicon', params: { accountId: '17282', siteId: '162050', zoneId: '776342' }},
+ { bidder: 'appnexus', params: { placementId: '11654195' }},
+ { bidder: 'ix', params: { siteId: '195457', size: [300, 250] }},
+ { bidder: 'ix', params: { siteId: '195457', size: [320, 100] }},
+ { bidder: 'ix', params: { siteId: '195457', size: [320, 50] }},
+ { bidder: 'ix', params: { siteId: '195457', size: [300, 50] }},
+ { bidder: 'openx', params: { unit: '539971072', delDomain: 'idm-d.openx.net' }},
{ bidder: 'sovrn', params: { tagid: '448839' }},
{ bidder: 'sovrn', params: { tagid: '448838' }},
- { bidder: 'indexExchange', params: { id: '9', siteID: '195457' }},
- { bidder: 'rubicon', params: { accountId: '17282', siteId: '162050', zoneId: '776342' }},
{ bidder: 'aol', params: { placement: '6479715', network: '4832.1', server: 'adserver.adtech.de' }},
{ bidder: 'aol', params: { placement: '6479721', network: '4832.1', server: 'adserver.adtech.de' }},
{ bidder: 'aol', params: { placement: '6479698', network: '4832.1', server: 'adserver.adtech.de' }},
{ bidder: 'pulsepoint', params: { cf: '300X250', cp: '561262', ct: '602789' }},
{ bidder: 'pulsepoint', params: { cf: '300X50', cp: '561262', ct: '602790' }},
- { bidder: 'pulsepoint', params: { cf: '320X50', cp: '561262', ct: '602791' }}]}];
+ { bidder: 'pulsepoint', params: { cf: '320X100', cp: '561262', ct: '661197' }},
+ { bidder: 'pulsepoint', params: { cf: '320X50', cp: '561262', ct: '602791' }}]},
+ {code: 'ad_contentslot_4', mediaTypes: { banner: { sizes: [[300, 250], [320, 100], [320, 50], [300, 50]] } },
+ bids: [{ bidder: 'rubicon', params: { accountId: '17282', siteId: '162050', zoneId: '776346' }},
+ { bidder: 'appnexus', params: { placementId: '11654198' }},
+ { bidder: 'ix', params: { siteId: '195459', size: [300, 250] }},
+ { bidder: 'ix', params: { siteId: '195459', size: [320, 100] }},
+ { bidder: 'ix', params: { siteId: '195459', size: [320, 50] }},
+ { bidder: 'ix', params: { siteId: '195459', size: [300, 50] }},
+ { bidder: 'openx', params: { unit: '539971074', delDomain: 'idm-d.openx.net' }},
+ { bidder: 'sovrn', params: { tagid: '448842' }},
+ { bidder: 'sovrn', params: { tagid: '448841' }},
+ { bidder: 'aol', params: { placement: '6479714', network: '4832.1', server: 'adserver.adtech.de' }},
+ { bidder: 'aol', params: { placement: '6479704', network: '4832.1', server: 'adserver.adtech.de' }},
+ { bidder: 'aol', params: { placement: '6479717', network: '4832.1', server: 'adserver.adtech.de' }},
+ { bidder: 'pulsepoint', params: { cf: '300X250', cp: '561262', ct: '602793' }},
+ { bidder: 'pulsepoint', params: { cf: '300X50', cp: '561262', ct: '602794' }},
+ { bidder: 'pulsepoint', params: { cf: '320X100', cp: '561262', ct: '661198' }},
+ { bidder: 'pulsepoint', params: { cf: '320X50', cp: '561262', ct: '602796' }}]},
+ {code: 'ad_contentslot_5', mediaTypes: { banner: { sizes: [[300, 250], [320, 100], [320, 50], [300, 50]] } },
+ bids: [{ bidder: 'rubicon', params: { accountId: '17282', siteId: '162050', zoneId: '776352' }},
+ { bidder: 'appnexus', params: { placementId: '11654202' }},
+ { bidder: 'ix', params: { siteId: '195461', size: [300, 250] }},
+ { bidder: 'ix', params: { siteId: '195461', size: [320, 100] }},
+ { bidder: 'ix', params: { siteId: '195461', size: [320, 50] }},
+ { bidder: 'ix', params: { siteId: '195461', size: [300, 50] }},
+ { bidder: 'openx', params: { unit: '539971076', delDomain: 'idm-d.openx.net' }},
+ { bidder: 'sovrn', params: { tagid: '448845' }},
+ { bidder: 'sovrn', params: { tagid: '448844' }},
+ { bidder: 'aol', params: { placement: '6479697', network: '4832.1', server: 'adserver.adtech.de' }},
+ { bidder: 'aol', params: { placement: '6479713', network: '4832.1', server: 'adserver.adtech.de' }},
+ { bidder: 'aol', params: { placement: '6479696', network: '4832.1', server: 'adserver.adtech.de' }},
+ { bidder: 'pulsepoint', params: { cf: '300X250', cp: '561262', ct: '602798' }},
+ { bidder: 'pulsepoint', params: { cf: '300X50', cp: '561262', ct: '602799' }},
+ { bidder: 'pulsepoint', params: { cf: '320X100', cp: '561262', ct: '661199' }},
+ { bidder: 'pulsepoint', params: { cf: '320X50', cp: '561262', ct: '602800' }}]}];
var pbjs = pbjs || {};
pbjs.que = pbjs.que || [];
@@ -311,14 +481,19 @@
'cap': true
}]
};
- pbjs.que.push(function() {
- pbjs.setConfig({
- priceGranularity: customGranularity,
- bidderSequence: "fixed"
- });
+ pbjsCfg = {
+ userSync: { syncsPerBidder: 50 },
+ priceGranularity: customGranularity,
+ maxRequestsPerOrigin: 1,
+ enableSendAllBids: false,
+ timeoutBuffer: 400,
+ bidderSequence: "fixed"
+ };
+ pbjs.que.push(function() {
+ pbjs.setConfig(pbjsCfg);
});
</script>
- <script type="text/javascript" src="/zhs/required.js?version=3.1.126"></script>
+ <script type="text/javascript" src="/zhs/required.js?version=4.0.64"></script>
<script type='text/javascript' async>
var pbAdUnits = getPrebidSlots(curResolution);
var googletag = googletag || {};
@@ -327,7 +502,6 @@
googletag.pubads().disableInitialLoad();
});
addPrebidAdUnits(pbAdUnits);
- setTimeout(sendPrebidServerRequest, PREBID_TIMEOUT);
var dfpSlots = {};
(function() {
@@ -346,19 +520,23 @@
dfpSlots['topslot_b'] = googletag.defineSlot('/2863368/topslot', [728, 90], 'ad_topslot_b').defineSizeMapping(mapping_topslot_b).setTargeting('vp', 'top').setTargeting('hp', 'center').setTargeting('ad_group', Adomik.randomAdGroup()).addService(googletag.pubads());
var mapping_leftslot = googletag.sizeMapping().addSize([963, 0], [160, 600]).addSize([0, 0], []).build();
dfpSlots['leftslot'] = googletag.defineSlot('/2863368/leftslot', [160, 600], 'ad_leftslot').defineSizeMapping(mapping_leftslot).setTargeting('vp', 'top').setTargeting('hp', 'left').setTargeting('ad_group', Adomik.randomAdGroup()).addService(googletag.pubads());
- var mapping_btmslot_a = googletag.sizeMapping().addSize([746, 0], [300, 250]).addSize([0, 0], [[300, 250], [320, 50], [300, 50]]).build();
- dfpSlots['btmslot_a'] = googletag.defineSlot('/2863368/btmslot', [300, 250], 'ad_btmslot_a').defineSizeMapping(mapping_btmslot_a).setTargeting('vp', 'btm').setTargeting('hp', 'center').setTargeting('ad_group', Adomik.randomAdGroup()).addService(googletag.pubads());
+ var mapping_btmslot_a = googletag.sizeMapping().addSize([746, 0], [[300, 250], 'fluid']).addSize([0, 0], [[300, 250], [320, 50], [300, 50], 'fluid']).build();
+ dfpSlots['btmslot_a'] = googletag.defineSlot('/2863368/btmslot', [[300, 250], 'fluid'], 'ad_btmslot_a').defineSizeMapping(mapping_btmslot_a).setTargeting('vp', 'btm').setTargeting('hp', 'center').setTargeting('ad_group', Adomik.randomAdGroup()).addService(googletag.pubads());
var mapping_houseslot_a = googletag.sizeMapping().addSize([963, 0], [300, 250]).addSize([0, 0], []).build();
dfpSlots['houseslot_a'] = googletag.defineSlot('/2863368/houseslot', [300, 250], 'ad_houseslot_a').defineSizeMapping(mapping_houseslot_a).setTargeting('vp', 'mid').setTargeting('hp', 'right').setTargeting('ad_group', Adomik.randomAdGroup()).addService(googletag.pubads());
var mapping_houseslot_b = googletag.sizeMapping().addSize([963, 0], []).addSize([0, 0], [300, 250]).build();
dfpSlots['houseslot_b'] = googletag.defineSlot('/2863368/houseslot', [], 'ad_houseslot_b').defineSizeMapping(mapping_houseslot_b).setTargeting('vp', 'btm').setTargeting('hp', 'center').setTargeting('ad_group', Adomik.randomAdGroup()).addService(googletag.pubads());
var mapping_rightslot = googletag.sizeMapping().addSize([746, 0], [300, 250]).addSize([0, 0], []).build();
dfpSlots['rightslot'] = googletag.defineSlot('/2863368/rightslot', [300, 250], 'ad_rightslot').defineSizeMapping(mapping_rightslot).setTargeting('vp', 'mid').setTargeting('hp', 'right').setTargeting('ad_group', Adomik.randomAdGroup()).addService(googletag.pubads());
- var mapping_contentslot = googletag.sizeMapping().addSize([746, 0], [300, 250]).addSize([0, 0], [[300, 250], [320, 50], [300, 50]]).build();
- dfpSlots['contentslot_1'] = googletag.defineSlot('/2863368/mpuslot', [300, 250], 'ad_contentslot_1').defineSizeMapping(mapping_contentslot).setTargeting('cdo_si', 1).setTargeting('vp', 'mid').setTargeting('hp', 'center').setTargeting('ad_group', Adomik.randomAdGroup()).addService(googletag.pubads());
- dfpSlots['contentslot_2'] = googletag.defineSlot('/2863368/mpuslot', [300, 250], 'ad_contentslot_2').defineSizeMapping(mapping_contentslot).setTargeting('cdo_si', 2).setTargeting('vp', 'mid').setTargeting('hp', 'center').setTargeting('ad_group', Adomik.randomAdGroup()).addService(googletag.pubads());
- dfpSlots['contentslot_3'] = googletag.defineSlot('/2863368/mpuslot', [300, 250], 'ad_contentslot_3').defineSizeMapping(mapping_contentslot).setTargeting('cdo_si', 3).setTargeting('vp', 'mid').setTargeting('hp', 'center').setTargeting('ad_group', Adomik.randomAdGroup()).addService(googletag.pubads());
+ var mapping_contentslot = googletag.sizeMapping().addSize([746, 0], [[300, 250], [336, 280], 'fluid']).addSize([0, 0], [[300, 250], [320, 100], [320, 50], [300, 50], 'fluid']).build();
+ dfpSlots['contentslot_1'] = googletag.defineSlot('/2863368/mpuslot', [[300, 250], [336, 280], 'fluid'], 'ad_contentslot_1').defineSizeMapping(mapping_contentslot).setTargeting('cdo_si', '1').setTargeting('vp', 'mid').setTargeting('hp', 'center').setTargeting('ad_group', Adomik.randomAdGroup()).addService(googletag.pubads());
+ dfpSlots['contentslot_2'] = googletag.defineSlot('/2863368/mpuslot', [[300, 250], [336, 280], 'fluid'], 'ad_contentslot_2').defineSizeMapping(mapping_contentslot).setTargeting('cdo_si', '2').setTargeting('vp', 'mid').setTargeting('hp', 'center').setTargeting('ad_group', Adomik.randomAdGroup()).addService(googletag.pubads());
+ dfpSlots['contentslot_3'] = googletag.defineSlot('/2863368/mpuslot', [[300, 250], [336, 280], 'fluid'], 'ad_contentslot_3').defineSizeMapping(mapping_contentslot).setTargeting('cdo_si', '3').setTargeting('vp', 'mid').setTargeting('hp', 'center').setTargeting('ad_group', Adomik.randomAdGroup()).addService(googletag.pubads());
+ dfpSlots['contentslot_4'] = googletag.defineSlot('/2863368/mpuslot', [[300, 250], [336, 280], 'fluid'], 'ad_contentslot_4').defineSizeMapping(mapping_contentslot).setTargeting('cdo_si', '4').setTargeting('vp', 'mid').setTargeting('hp', 'center').setTargeting('ad_group', Adomik.randomAdGroup()).addService(googletag.pubads());
+ dfpSlots['contentslot_5'] = googletag.defineSlot('/2863368/mpuslot', [[300, 250], [336, 280], 'fluid'], 'ad_contentslot_5').defineSizeMapping(mapping_contentslot).setTargeting('cdo_si', '5').setTargeting('vp', 'mid').setTargeting('hp', 'center').setTargeting('ad_group', Adomik.randomAdGroup()).addService(googletag.pubads());
googletag.pubads().addEventListener('slotRenderEnded', function(event) { if (!event.isEmpty && event.slot.renderCallback) { event.slot.renderCallback(event); } });
+
+ googletag.pubads().setTargeting('ad_h', Adomik.hour);
googletag.pubads().setTargeting("cdo_pc", "dictionary");
googletag.pubads().setTargeting("cdo_pt", "entry");
googletag.pubads().setTargeting("cdo_dc", "english-chinese-traditional");
@@ -371,6 +549,7 @@
googletag.pubads().setCategoryExclusion('lcp').setCategoryExclusion('resp').setCategoryExclusion('wprod');
+
googletag.pubads().enableSingleRequest();
googletag.pubads().collapseEmptyDivs(false);
googletag.enableServices();
@@ -379,12 +558,12 @@
<meta property="og:title" content="catch汉语(繁体)翻译：剑桥词典" />
<meta property="og:description" content="catch翻译：抓住, 抓住，接住, 阻止逃跑, 逮住，捉住, 注意, 發現，撞見，注意到, 旅行, 趕，乘，搭乘（飛機、火車、公共汽車等）, 感染, （尤指因感染細菌或病毒）罹患（病），染（疾）, 卡住, （使）掛住，鉤住，卡住, 及時, 及時趕上, 聽見／看見, 聽見，聽到, 碰撞, （尤指無意中）撞上，碰上, 陷入, 呼吸, 被接觸, 燃燒, 開始燃燒；著火, 問題, 隱藏的問題；暗藏的不利因素, 捕獲東西, （魚的）捕獲量, 般配的人；合適的對象, 固定裝置, （門、窗、包等的）栓，扣，鉤, （身體部位）僵硬，強直。了解更多。" />
- <meta property="og:image" content="/zhs/external/images/CDO_logo_120x120.jpg?version=3.1.126" />
+ <meta property="og:image" content="https://dictionary.cambridge.org/zhs/external/images/CDO_logo_120x120.jpg" />
</head>
<body class="default_layout">
<div itemscope itemtype="http://schema.org/Product" style="display: none;">
<span itemprop="name">catch汉语(繁体)翻译：剑桥词典</span>
- <a itemprop="image" href="/zhs/external/images/CDO_logo_120x120.jpg?version=3.1.126">剑桥词典logo</a>
+ <a itemprop="image" href="/zhs/external/images/CDO_logo_120x120.jpg?version=4.0.64">剑桥词典logo</a>
</div>
<div class="overlay js-nav-trig"></div>
@@ -447,38 +626,42 @@
<span class="pointer js-toggle-children" data-target-selector="next" title="更改语言方向"><i class="fcdo fcdo-exchange fcdo--nudge" aria-hidden="true"></i></span>
<span>
<a style="display: inline;" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%84%8F%E5%A4%A7%E5%88%A9%E8%AF%AD/" data-dictCode="english-italian" title="剑桥英语-意大利语词典">英语-意大利语</a>
- <a style="display: none;" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E6%84%8F%E5%A4%A7%E5%88%A9%E8%AF%AD-%E8%8B%B1%E8%AF%AD/" data-dictCode="italian-english" title="Italian-English Dictionary">Italian–English</a>
+ <a style="display: none;" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E6%84%8F%E5%A4%A7%E5%88%A9%E8%AF%AD-%E8%8B%B1%E8%AF%AD/" data-dictCode="italian-english" title="意大利语-英语词典">意大利语–英语</a>
</span>
</li>
<li>
<span class="pointer js-toggle-children" data-target-selector="next" title="更改语言方向"><i class="fcdo fcdo-exchange fcdo--nudge" aria-hidden="true"></i></span>
<span>
<a style="display: inline;" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B3%A2%E5%85%B0%E8%AF%AD/" data-dictCode="english-polish" title="剑桥英语-波兰语词典">英语-波兰语</a>
- <a style="display: none;" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E6%B3%A2%E5%85%B0%E8%AF%AD-%E8%8B%B1%E8%AF%AD/" data-dictCode="polish-english" title="Polish-English Dictionary">Polish–English</a>
+ <a style="display: none;" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E6%B3%A2%E5%85%B0%E8%AF%AD-%E8%8B%B1%E8%AF%AD/" data-dictCode="polish-english" title="波兰语-英语词典">波兰语–英语</a>
</span>
</li>
<li>
<span class="pointer js-toggle-children" data-target-selector="next" title="更改语言方向"><i class="fcdo fcdo-exchange fcdo--nudge" aria-hidden="true"></i></span>
<span>
<a style="display: inline;" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E8%91%A1%E8%90%84%E7%89%99%E8%AF%AD/" data-dictCode="english-portuguese" title="剑桥英语-葡萄牙语词典">英语-葡萄牙语</a>
- <a style="display: none;" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%91%A1%E8%90%84%E7%89%99%E8%AF%AD-%E8%8B%B1%E8%AF%AD/" data-dictCode="portuguese-english" title="Portuguese-English Dictionary">Portuguese–English</a>
+ <a style="display: none;" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%91%A1%E8%90%84%E7%89%99%E8%AF%AD-%E8%8B%B1%E8%AF%AD/" data-dictCode="portuguese-english" title="葡萄牙语-英语词典">葡萄牙语–英语</a>
</span>
</li>
<li>
<span class="pointer js-toggle-children" data-target-selector="next" title="更改语言方向"><i class="fcdo fcdo-exchange fcdo--nudge" aria-hidden="true"></i></span>
<span>
<a style="display: inline;" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%97%A5%E8%AF%AD/" data-dictCode="english-japanese" title="剑桥英语-日语词典">英语-日语</a>
- <a style="display: none;" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/japanese-english/" data-dictCode="japanese-english" title="Japanese-English Dictionary">Japanese–English</a>
+ <a style="display: none;" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/japanese-english/" data-dictCode="japanese-english" title="日语-英语词典">日语–英语</a>
</span>
</li>
<li class="off-canvas__nav__section"><strong>半双语</strong></li>
+ <li><a href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8D%B7%E5%85%B0%E8%AF%AD-%E8%8B%B1%E8%AF%AD/" title="荷兰语-英语词典">荷兰语-英语</a></li>
<li><a href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E9%98%BF%E6%8B%89%E4%BC%AF%E8%AF%AD/" title="剑桥英语-阿拉伯语词典">英语-阿拉伯语</a></li>
<li><a href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E5%8A%A0%E6%B3%B0%E7%BD%97%E5%B0%BC%E4%BA%9A%E8%AF%AD/" title="剑桥英语-加泰罗尼亚语词典">英语-加泰罗尼亚语</a></li>
<li><a href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%AE%80%E4%BD%93/" title="剑桥英语-汉语（简体）词典">英语-汉语（简体）</a></li>
<li><a href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%B9%81%E4%BD%93/" title="剑桥英语-汉语（繁体）词典">英语-汉语（繁体）</a></li>
+ <li><a href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%8D%B7%E5%85%8B%E8%AF%AD/" title="英语-捷克语词典">英语- 捷克语</a></li>
+ <li><a href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E4%B8%B9%E9%BA%A6%E8%AF%AD/" title="英语-丹麦语词典">英语- 丹麦语</a></li>
<li><a href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E9%9F%A9%E8%AF%AD/" title="剑桥英语-韩语词典">英语-韩语</a></li>
<li><a href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E9%A9%AC%E6%9D%A5%E8%A5%BF%E4%BA%9A%E8%AF%AD/" title="英语-马来语词典">英语-马来语</a></li>
+ <li><a href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%8C%AA%E5%A8%81%E8%AF%AD/" title="英语-挪威语词典">英语-挪威语</a></li>
<li><a href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E4%BF%84%E8%AF%AD/" title="剑桥英语-俄语词典">英语-俄语</a></li>
<li><a href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B3%B0%E8%AF%AD/" title="英语-泰语词典">英语-泰语</a></li>
<li><a href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E5%9C%9F%E8%80%B3%E5%85%B6%E8%AF%AD/" title="英语-土耳其语词典">英语-土耳其语</a></li>
@@ -498,7 +681,7 @@
<div class="off-canvas__pad">
<p>
- <a class="btn btn--impact btn--bold js-toggle" data-target-selector="#modal-login">
+ <a class="btn btn--impact btn--bold loginBtn btn--forbidden">
<i class="fcdo fcdo-user" aria-hidden="true"></i> 登录 </a>
</p>
<div class="off-canvas__dropdown">
@@ -511,13 +694,15 @@
<li><a href="/dictionary/english-chinese-traditional/catch" hreflang="en">English (UK)</a>
<li><a href="/us/dictionary/english-chinese-traditional/catch" hreflang="en-US">English (US)</a>
<li><a href="/es/diccionario/ingles-chino-tradicional/catch" hreflang="es">Español</a>
+ <li><a href="/es-LA/dictionary/english-chinese-traditional/catch" hreflang="es-419">Español (Latinoamérica)</a>
<li><a href="/ru/%D1%81%D0%BB%D0%BE%D0%B2%D0%B0%D1%80%D1%8C/%D0%B0%D0%BD%D0%B3%D0%BB%D0%BE-%D0%BA%D0%B8%D1%82%D0%B0%D0%B9%D1%81%D0%BA%D0%B8%D0%B9-%D1%82%D1%80%D0%B0%D0%B4%D0%B8%D1%86%D0%B8%D0%BE%D0%BD%D0%BD%D1%8B%D0%B9/catch" hreflang="ru">Русский</a>
<li><a href="/pt/dicionario/ingles-chines-tradicional/catch" hreflang="pt">Português</a>
<li><a href="/de/worterbuch/englisch-chinesisch-traditionelle/catch" hreflang="de">Deutsch</a>
<li><a href="/fr/dictionnaire/anglais-chinois-traditionnel/catch" hreflang="fr">Français</a>
<li><a href="/it/dizionario/inglese-cinese-tradizionale/catch" hreflang="it">Italiano</a>
<li><a href="/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%B9%81%E4%BD%93/catch" hreflang="zh-Hans">中文 (简体)</a>
- <li><a href="/zht/%E8%A9%9E%E5%85%B8/%E8%8B%B1%E8%AA%9E-%E6%BC%A2%E8%AA%9E-%E7%B9%81%E9%AB%94/catch" hreflang="zh-Hant">中文 (繁體)</a>
+ <li><a href="/zht/%E8%A9%9E%E5%85%B8/%E8%8B%B1%E8%AA%9E-%E6%BC%A2%E8%AA%9E-%E7%B9%81%E9%AB%94/catch" hreflang="zh-Hant">正體中文 (繁體)</a>
+ <li><a href="/pl/dictionary/english-chinese-traditional/catch" hreflang="pl">Polski</a>
<li><a href="/ko/%EC%82%AC%EC%A0%84/%EC%98%81%EC%96%B4-%EC%A4%91%EA%B5%AD%EC%96%B4-%EB%B2%88%EC%B2%B4/catch" hreflang="ko">한국어</a>
<li><a href="/tr/s%C3%B6zl%C3%BCk/ingilizce-geleneksel-%C3%A7ince/catch" hreflang="tr">Türkçe</a>
<li><a href="/ja/dictionary/english-chinese-traditional/catch" hreflang="ja">日本語</a>
@@ -540,15 +725,15 @@
<li><b>关注我们</b></li>
<li><a href="https://www.facebook.com/home.php?#!/pages/Cambridge-Dictionaries-Online/118775618133878" title="赞" class="circle bg--fb" target="_blank"><i class="fcdo fcdo-facebook" aria-hidden="true"></i></a></li>
<li><a href="https://twitter.com/CambridgeWords" title="关注" class="circle bg--tw" target="_blank"><i class="fcdo fcdo-twitter" aria-hidden="true"></i></a></li>
- <li><a href="https://plus.google.com/b/108790671280639180398" title="粉丝" class="circle bg--gp" target="_blank"><i class="fcdo fcdo-google-plus" aria-hidden="true"></i></a></li>
+ <li><a href="https://plus.google.com/+cambridgedictionary" title="粉丝" class="circle bg--gp" target="_blank"><i class="fcdo fcdo-google-plus" aria-hidden="true"></i></a></li>
</ul>
</div>
<div class="cdo-hdr__profile">
<a class="hdr-btn ico-bg js-toggle" >
- <span class="btn btn--impact btn--bold js-toggle" data-target-selector="#modal-login">
- <i class="fcdo fcdo-user"></i>
- <span class="resp resp--lrg-i">登录</span>
- </span>
+ <span class="btn btn--impact btn--bold loginBtn btn--forbidden">
+ <i class="fcdo fcdo-user"></i>
+ <span class="resp resp--lrg-i">登录</span>
+ </span>
</a>
<div class="dropdown dropdown--pad-a dropdown--right">
@@ -562,13 +747,15 @@
<li><a href="/dictionary/english-chinese-traditional/catch" hreflang="en">English (UK)</a></li>
<li><a href="/us/dictionary/english-chinese-traditional/catch" hreflang="en-US">English (US)</a></li>
<li><a href="/es/diccionario/ingles-chino-tradicional/catch" hreflang="es">Español</a></li>
+ <li><a href="/es-LA/dictionary/english-chinese-traditional/catch" hreflang="es-419">Español (Latinoamérica)</a></li>
<li><a href="/ru/%D1%81%D0%BB%D0%BE%D0%B2%D0%B0%D1%80%D1%8C/%D0%B0%D0%BD%D0%B3%D0%BB%D0%BE-%D0%BA%D0%B8%D1%82%D0%B0%D0%B9%D1%81%D0%BA%D0%B8%D0%B9-%D1%82%D1%80%D0%B0%D0%B4%D0%B8%D1%86%D0%B8%D0%BE%D0%BD%D0%BD%D1%8B%D0%B9/catch" hreflang="ru">Русский</a></li>
<li><a href="/pt/dicionario/ingles-chines-tradicional/catch" hreflang="pt">Português</a></li>
<li><a href="/de/worterbuch/englisch-chinesisch-traditionelle/catch" hreflang="de">Deutsch</a></li>
<li><a href="/fr/dictionnaire/anglais-chinois-traditionnel/catch" hreflang="fr">Français</a></li>
<li><a href="/it/dizionario/inglese-cinese-tradizionale/catch" hreflang="it">Italiano</a></li>
<li><a href="/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%B9%81%E4%BD%93/catch" hreflang="zh-Hans">中文 (简体)</a></li>
- <li><a href="/zht/%E8%A9%9E%E5%85%B8/%E8%8B%B1%E8%AA%9E-%E6%BC%A2%E8%AA%9E-%E7%B9%81%E9%AB%94/catch" hreflang="zh-Hant">中文 (繁體)</a></li>
+ <li><a href="/zht/%E8%A9%9E%E5%85%B8/%E8%8B%B1%E8%AA%9E-%E6%BC%A2%E8%AA%9E-%E7%B9%81%E9%AB%94/catch" hreflang="zh-Hant">正體中文 (繁體)</a></li>
+ <li><a href="/pl/dictionary/english-chinese-traditional/catch" hreflang="pl">Polski</a></li>
<li><a href="/ko/%EC%82%AC%EC%A0%84/%EC%98%81%EC%96%B4-%EC%A4%91%EA%B5%AD%EC%96%B4-%EB%B2%88%EC%B2%B4/catch" hreflang="ko">한국어</a></li>
<li><a href="/tr/s%C3%B6zl%C3%BCk/ingilizce-geleneksel-%C3%A7ince/catch" hreflang="tr">Türkçe</a></li>
<li><a href="/ja/dictionary/english-chinese-traditional/catch" hreflang="ja">日本語</a></li>
@@ -674,40 +861,44 @@
<span class="bilingual-switch pointer js-toggle-children" data-target-selector="next" title="更改语言方向"><i class="fcdo fcdo-exchange fcdo--nudge" aria-hidden="true"></i></span>
<span>
<a style="display: inline;" href="#" data-dictCode="english-italian" title="剑桥英语-意大利语词典">英语-意大利语</a>
- <a style="display: none;" href="#" data-dictCode="italian-english" title="Italian-English Dictionary">Italian–English</a>
+ <a style="display: none;" href="#" data-dictCode="italian-english" title="意大利语-英语词典">意大利语–英语</a>
</span>
</li>
<li>
<span class="bilingual-switch pointer js-toggle-children" data-target-selector="next" title="更改语言方向"><i class="fcdo fcdo-exchange fcdo--nudge" aria-hidden="true"></i></span>
<span>
<a style="display: inline;" href="#" data-dictCode="english-polish" title="剑桥英语-波兰语词典">英语-波兰语</a>
- <a style="display: none;" href="#" data-dictCode="polish-english" title="Polish-English Dictionary">Polish–English</a>
+ <a style="display: none;" href="#" data-dictCode="polish-english" title="波兰语-英语词典">波兰语–英语</a>
</span>
</li>
<li>
<span class="bilingual-switch pointer js-toggle-children" data-target-selector="next" title="更改语言方向"><i class="fcdo fcdo-exchange fcdo--nudge" aria-hidden="true"></i></span>
<span>
<a style="display: inline;" href="#" data-dictCode="english-portuguese" title="剑桥英语-葡萄牙语词典">英语-葡萄牙语</a>
- <a style="display: none;" href="#" data-dictCode="portuguese-english" title="Portuguese-English Dictionary">Portuguese–English</a>
+ <a style="display: none;" href="#" data-dictCode="portuguese-english" title="葡萄牙语-英语词典">葡萄牙语–英语</a>
</span>
</li>
<li>
<span class="bilingual-switch pointer js-toggle-children" data-target-selector="next" title="更改语言方向"><i class="fcdo fcdo-exchange fcdo--nudge" aria-hidden="true"></i></span>
<span>
<a style="display: inline;" href="#" data-dictCode="english-japanese" title="剑桥英语-日语词典">英语-日语</a>
- <a style="display: none;" href="#" data-dictCode="japanese-english" title="Japanese-English Dictionary">Japanese–English</a>
+ <a style="display: none;" href="#" data-dictCode="japanese-english" title="日语-英语词典">日语–英语</a>
</span>
</li>
</ul>
<div class="h3">半双语词典</div>
<ul>
+ <li><a href="#" data-dictCode="dutch-english" title="荷兰语-英语词典">荷兰语-英语</a></li>
<li><a href="#" data-dictCode="english-arabic" title="剑桥英语-阿拉伯语词典">英语-阿拉伯语</a></li>
<li><a href="#" data-dictCode="english-catalan" title="剑桥英语-加泰罗尼亚语词典">英语-加泰罗尼亚语</a></li>
<li><a href="#" data-dictCode="english-chinese-simplified" title="剑桥英语-汉语（简体）词典">英语-汉语（简体）</a></li>
<li><a href="#" data-dictCode="english-chinese-traditional" title="剑桥英语-汉语（繁体）词典">英语-汉语（繁体）</a></li>
+ <li><a href="#" data-dictCode="english-czech" title="英语-捷克语词典">英语- 捷克语</a></li>
+ <li><a href="#" data-dictCode="english-danish" title="英语-丹麦语词典">英语- 丹麦语</a></li>
<li><a href="#" data-dictCode="english-korean" title="剑桥英语-韩语词典">英语-韩语</a></li>
<li><a href="#" data-dictCode="english-malaysian" title="英语-马来语词典">英语-马来语</a></li>
+ <li><a href="#" data-dictCode="english-norwegian" title="英语-挪威语词典">英语-挪威语</a></li>
<li><a href="#" data-dictCode="english-russian" title="剑桥英语-俄语词典">英语-俄语</a></li>
<li><a href="#" data-dictCode="english-thai" title="英语-泰语词典">英语-泰语</a></li>
<li><a href="#" data-dictCode="turkish" title="英语-土耳其语词典">英语-土耳其语</a></li>
@@ -726,6 +917,8 @@
</form> </div>
</header>
+ <div id="overlay"></div>
+
<div id='ad_topslot_a' class='am-default '>
<script type='text/javascript'>
@@ -804,6 +997,29 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -832,50 +1048,41 @@
<div id="page-content" class="cdo-tpl__z cdo-tpl-main__z2 clrd" role="main">
<div id="entryContent" class="entrybox english-chinese-traditional entry-body" lang="en" itemscope itemtype="http://schema.org/WebPage">
<div itemprop="author" itemscope itemtype="http://schema.org/Organization">
- <meta itemprop="name" content='剑桥在线词典' />
- <meta itemprop="url" content="https://plus.google.com/108790671280639180398" />
- </div>
- <div itemprop="publisher" itemscope itemtype="http://schema.org/Organization">
- <meta itemprop="name" content="©剑桥大学出版社" />
- <meta itemprop="url" content="https://plus.google.com/112563436639321822653" />
+ <meta itemprop="name" content='Cambridge Dictionary' />
+ <meta itemprop="url" content="https://plus.google.com/+cambridgedictionary" />
</div>
<meta itemprop="headline" content="catch翻译：抓住, 抓住，接住, 阻止逃跑, 逮住，捉住, 注意, 發現，撞見，注意到, 旅行, 趕，乘，搭乘（飛機、火車、公共汽車等）, 感染, （尤指因感染細菌或病毒）罹患（病），染（疾）, 卡住, （使）掛住，鉤住，卡住, 及時, 及時趕上, 聽見／看見, 聽見，聽到, 碰撞, （尤指無意中）撞上，碰上, 陷入, 呼吸, 被接觸, 燃燒, 開始燃燒；著火, 問題, 隱藏的問題；暗藏的不利因素, 捕獲東西, （魚的）捕獲量, 般配的人；合適的對象, 固定裝置, （門、窗、包等的）栓，扣，鉤, （身體部位）僵硬，強直。了解更多。" />
- <meta itemprop="copyrightHolder" content="©剑桥大学出版社" />
+ <meta itemprop="copyrightHolder" content="© Cambridge University Press" />
<meta itemprop="copyrightYear" content="2018" />
<meta itemprop="inLanguage" content="zh" />
<div class="cdo-dblclick-area">
- <div class="di superentry" itemprop="text">
- <div class="di-head"><div class="di-title">
- <h1 class="hw" title="什么是“catch”?">
- “catch”在英语-汉语(繁体)词典中的翻译
- </h1>
- </div>
-
- <a href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%B9%81%E4%BD%93/catch#translations" class="see-all-translations a--rev"><i class="fcdo fcdo-caret-right" aria-hidden="true"> </i><b>查看所有翻译</b></a>
- <a href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%AE%80%E4%BD%93/catch" class="see-all-translations a--rev">
+ <div class="di superentry" itemprop="text">
+ <div class="di-head"><div class="di-title">
+ <h1 class="hw" title="什么是“catch”?">
+ “catch”在英语-汉语(繁体)词典中的翻译
+ </h1>
+ </div>
+
+ <a href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%B9%81%E4%BD%93/catch#translations" class="see-all-translations a--rev"><i class="fcdo fcdo-caret-right" aria-hidden="true"> </i><b>查看所有翻译</b></a>
+ <a href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%AE%80%E4%BD%93/catch" class="see-all-translations a--rev">
<i class="fcdo fcdo-caret-right" aria-hidden="true"> </i>
<b>在英语-汉语(简体)词典中查看“catch”</b>
</a>
- </div>
- <div class="di-body"><div class="entry"><div class="entry-body"> <div class="entry-body__el clrd js-share-holder"><div class="pos-header">
- <div class="h3 di-title cdo-section-title-hw"><span class="headword"><span class="hw">catch</span></span>
+ </div>
+ <div class="di-body"><div class="entry"><div class="entry-body"> <div class="entry-body__el clrd js-share-holder"><div class="pos-header"><div class="h3 di-title cdo-section-title-hw"><span class="headword"><span class="hw">catch</span></span>
<span class="posgram ico-bg"><span class="pos" title="A word that describes an action, condition or experience.">verb</span></span>
</div>
- <span class="pron-info"><span class="uk"><span class="region">uk</span>
- <span title="catch: listen to British English pronunciation" data-src-mp3="https://dictionary.cambridge.org/zhs/media/english-chinese-traditional/uk_pron/u/ukc/ukcas/ukcaste029.mp3" data-src-ogg="https://dictionary.cambridge.org/zhs/media/english-chinese-traditional/uk_pron_ogg/u/ukc/ukcas/ukcaste029.ogg" class="circle circle-btn sound audio_play_button uk">
+ <span class="uk"><span class="region">uk</span>
+ <span title="catch: listen to British English pronunciation" data-src-mp3="/zhs/media/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%B9%81%E4%BD%93/uk_pron/u/ukc/ukcas/ukcaste029.mp3" data-src-ogg="/zhs/media/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%B9%81%E4%BD%93/uk_pron_ogg/u/ukc/ukcas/ukcaste029.ogg" class="circle circle-btn sound audio_play_button">
<i class='fcdo fcdo-volume-up'>​</i>
</span>
- </span>
- <span class="uk"><span class="pron">/<span class="ipa">kætʃ</span>/</span></span>
- </span><span class="pron-info"><span class="us"><span class="region">us</span>
- <span title="catch: listen to American pronunciation" data-src-mp3="https://dictionary.cambridge.org/zhs/media/english-chinese-traditional/us_pron/c/cat/catch/catch.mp3" data-src-ogg="https://dictionary.cambridge.org/zhs/media/english-chinese-traditional/us_pron_ogg/c/cat/catch/catch.ogg" class="circle circle-btn sound audio_play_button us">
+ <span class="pron">/<span class="ipa">kætʃ</span>/</span> </span><span class="us"><span class="region">us</span>
+ <span title="catch: listen to American pronunciation" data-src-mp3="/zhs/media/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%B9%81%E4%BD%93/us_pron/c/cat/catch/catch.mp3" data-src-ogg="/zhs/media/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%B9%81%E4%BD%93/us_pron_ogg/c/cat/catch/catch.ogg" class="circle circle-btn sound audio_play_button">
<i class='fcdo fcdo-volume-up'>​</i>
</span>
- </span>
- <span class="uk"><span class="pron">/<span class="ipa">kætʃ</span>/</span></span>
- </span><span title="Irregular inflection" class="irreg-infls"><span class="inf-group"><span class="inf">caught</span></span>, <span class="inf-group"><span class="inf">caught</span></span></span>
+ <span class="pron">/<span class="ipa">kætʃ</span>/</span> </span><span class="irreg-infls"><span class="inf-group"><span class="inf">caught</span></span>, <span class="inf-group"><span class="inf">caught</span></span></span>
<div class="share rounded js-share">
<span class="point"></span>
@@ -895,9 +1102,6 @@ <h1 class="hw" title="什么是“catch”?">
</a>
<a class="circle bg--di socialShareLink" title="在Diigo上分享该词条" href='https://www.diigo.com/post?url=https%3A%2F%2Fdictionary.cambridge.org%2Fzhs%2F%25E8%25AF%258D%25E5%2585%25B8%2F%25E8%258B%25B1%25E8%25AF%25AD-%25E6%25B1%2589%25E8%25AF%25AD-%25E7%25B9%2581%25E4%25BD%2593%2Fcatch&title=catch%E6%B1%89%E8%AF%AD%28%E7%B9%81%E4%BD%93%29%E7%BF%BB%E8%AF%91%EF%BC%9A%E5%89%91%E6%A1%A5%E8%AF%8D%E5%85%B8' target='_blank' data-social='diigo' data-url='https://www.diigo.com/post?url=https%3A%2F%2Fdictionary.cambridge.org%2Fzhs%2F%25E8%25AF%258D%25E5%2585%25B8%2F%25E8%258B%25B1%25E8%25AF%25AD-%25E6%25B1%2589%25E8%25AF%25AD-%25E7%25B9%2581%25E4%25BD%2593%2Fcatch&title=catch%E6%B1%89%E8%AF%AD%28%E7%B9%81%E4%BD%93%29%E7%BF%BB%E8%AF%91%EF%BC%9A%E5%89%91%E6%A1%A5%E8%AF%8D%E5%85%B8' data-object='entry'>
<i class="fcdo fcdo-diigo" aria-hidden="true"></i>
- </a>
- <a class="circle bg--su socialShareLink" title="在StumbleUpon上分享该词条" href='https://www.stumbleupon.com/likecontent?url=https%3A%2F%2Fdictionary.cambridge.org%2Fzhs%2F%25E8%25AF%258D%25E5%2585%25B8%2F%25E8%258B%25B1%25E8%25AF%25AD-%25E6%25B1%2589%25E8%25AF%25AD-%25E7%25B9%2581%25E4%25BD%2593%2Fcatch&title=catch%E6%B1%89%E8%AF%AD%28%E7%B9%81%E4%BD%93%29%E7%BF%BB%E8%AF%91%EF%BC%9A%E5%89%91%E6%A1%A5%E8%AF%8D%E5%85%B8' target='_blank' data-social='stumbleupon' data-url='https://www.stumbleupon.com/likecontent?url=https%3A%2F%2Fdictionary.cambridge.org%2Fzhs%2F%25E8%25AF%258D%25E5%2585%25B8%2F%25E8%258B%25B1%25E8%25AF%25AD-%25E6%25B1%2589%25E8%25AF%25AD-%25E7%25B9%2581%25E4%25BD%2593%2Fcatch&title=catch%E6%B1%89%E8%AF%AD%28%E7%B9%81%E4%BD%93%29%E7%BF%BB%E8%AF%91%EF%BC%9A%E5%89%91%E6%A1%A5%E8%AF%8D%E5%85%B8' data-object='entry'>
- <i class="fcdo fcdo-stumbleupon" aria-hidden="true"></i>
</a>
<a class="circle bg--tu socialShareLink" title="在Tumblr上分享该词条" href='https://www.tumblr.com/share/link?url=https%3A%2F%2Fdictionary.cambridge.org%2Fzhs%2F%25E8%25AF%258D%25E5%2585%25B8%2F%25E8%258B%25B1%25E8%25AF%25AD-%25E6%25B1%2589%25E8%25AF%25AD-%25E7%25B9%2581%25E4%25BD%2593%2Fcatch&name=catch%E6%B1%89%E8%AF%AD%28%E7%B9%81%E4%BD%93%29%E7%BF%BB%E8%AF%91%EF%BC%9A%E5%89%91%E6%A1%A5%E8%AF%8D%E5%85%B8' target='_blank' data-social='tumblr' data-url='https://www.tumblr.com/share/link?url=https%3A%2F%2Fdictionary.cambridge.org%2Fzhs%2F%25E8%25AF%258D%25E5%2585%25B8%2F%25E8%258B%25B1%25E8%25AF%25AD-%25E6%25B1%2589%25E8%25AF%25AD-%25E7%25B9%2581%25E4%25BD%2593%2Fcatch&name=catch%E6%B1%89%E8%AF%AD%28%E7%B9%81%E4%BD%93%29%E7%BF%BB%E8%AF%91%EF%BC%9A%E5%89%91%E6%A1%A5%E8%AF%8D%E5%85%B8' data-object='entry'>
<i class="fcdo fcdo-tumblr" aria-hidden="true"></i>
@@ -912,430 +1116,264 @@ <h1 class="hw" title="什么是“catch”?">
</div>
</div><div class="pos-body">
- <div class="sense-block" id="english-chinese-traditional-1-1-1">
-
- <h3 class="txt-block txt-block--alt2"><span class="hw">catch</span> <span class="pos" title="A word that describes an action, condition or experience.">verb</span> <span class="guideword" title="Guide word: helps you find the right meaning when a word has more than one meaning">
+ <div class="sense-block" id="english-chinese-traditional-1-1-1"> <h3 class="txt-block txt-block--alt2"><span class="hw">catch</span> <span class="pos" title="A word that describes an action, condition or experience.">verb</span> <span class="guideword" title="Guide word: helps you find the right meaning when a word has more than one meaning">
(<span>TAKE HOLD</span>)
- </span></h3>
- <div class="sense-body">
- <div class="def-block pad-indent" data-wl-senseid="ID_00004871_01"><p class="def-head semi-flush"><span class="def-info"><span title="A1: Beginner level. English Vocabulary Profile symbols A1-C2 show which words and phrases learners know at each level." class="epp-xref A1">A1</span> <span class="gram"><a href="https://dictionary.cambridge.org/zhs/help/codes.html">[<span class="gcs"> <span title="Intransitive verb: a verb that has no object." class="gc">I</span> or <span title="Transitive verb: a verb that has an object." class="gc">T</span> </span>]</a></span></span> <b class="def">to take <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%B9%81%E4%BD%93/hold" title="hold">hold</a> of something, <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%B9%81%E4%BD%93/especially" title="especially">especially</a> something that is <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%B9%81%E4%BD%93/moving" title="moving">moving</a> through the <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%B9%81%E4%BD%93/air" title="air">air</a></b></p><span class="def-body">
- <span class="trans" lang="zh-Hant">
-
- 抓住，接住</span>
- <div class="examp emphasized"> <span title="Example" class="eg">I <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%B9%81%E4%BD%93/manage" title="managed">managed</a> to catch the <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%B9%81%E4%BD%93/glass" title="glass">glass</a> before it <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%B9%81%E4%BD%93/hit" title="hit">hit</a> the <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%B9%81%E4%BD%93/ground" title="ground">ground</a>.</span>
- <span class="trans" lang="zh-Hant">
-
- 我在玻璃杯落地之前接住了它。</span>
- </div><div class="examp emphasized"> <span title="Example" class="eg">We <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%B9%81%E4%BD%93/saw" title="saw">saw</a> the <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%B9%81%E4%BD%93/eagle" title="eagle">eagle</a> <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%B9%81%E4%BD%93/swoop" title="swoop">swoop</a> from the <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%B9%81%E4%BD%93/sky" title="sky">sky</a> to catch <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%B9%81%E4%BD%93/its" title="its">its</a> <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%B9%81%E4%BD%93/prey" title="prey">prey</a>.</span>
- <span class="trans" lang="zh-Hant">
-
- 我們看到老鷹從空中猛撲下去抓捕獵物。</span>
- </div><div class="examp emphasized"> <span title="Example" class="eg">Our <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%B9%81%E4%BD%93/dog" title="dog">dog</a> <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%B9%81%E4%BD%93/ran" title="ran">ran</a> past me and out of the <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%B9%81%E4%BD%93/house" title="house">house</a> before I could catch it.</span>
- <span class="trans" lang="zh-Hant">
-
- 我們的狗從我身邊跑過，我沒抓住，讓它跑出了屋子。</span>
- </div><div class="examp emphasized"> <span title="Example" class="eg">He caught <span class="b"><a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%B9%81%E4%BD%93/hold" title="hold">hold</a></span> <span class="b">of</span> my <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%B9%81%E4%BD%93/arm" title="arm">arm</a>.</span>
- <span class="trans" lang="zh-Hant">
-
- 他一把抓住了我的胳膊。</span>
- </div><div class="examp emphasized"> <span title="Example" class="eg">We <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%B9%81%E4%BD%93/place" title="placed">placed</a> <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%B9%81%E4%BD%93/saucepan" title="saucepans">saucepans</a> on the <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%B9%81%E4%BD%93/floor" title="floor">floor</a> to catch <span class="gloss">(= <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%B9%81%E4%BD%93/collect" title="collect">collect</a>)</span> the <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%B9%81%E4%BD%93/drop" title="drops">drops</a> of <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%B9%81%E4%BD%93/water" title="water">water</a> coming through the <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%B9%81%E4%BD%93/roof" title="roof">roof</a>.</span>
- <span class="trans" lang="zh-Hant">
-
- 我們把平底鍋放在地上接屋頂漏下的水。</span>
- </div><div class="examp emphasized"><span class="lab"><span title="British English" class="region">UK</span> </span><span title="Example" class="eg">The <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%B9%81%E4%BD%93/batsman" title="batsman">batsman</a> was caught <span class="b">(out)</span> <span class="gloss">(= someone in the other <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%B9%81%E4%BD%93/team" title="team">team</a> caught the <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%B9%81%E4%BD%93/ball" title="ball">ball</a> when he <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%B9%81%E4%BD%93/hit" title="hit">hit</a> it)</span>.</span>
- <span class="trans" lang="zh-Hant">
-
- 打擊手擊出的球被接住了。</span>
+ </span></h3> <div class="sense-body">
+ <div class="def-block pad-indent" data-wl-senseid="ID_00004871_01"><p class="def-head semi-flush"><span class="def-info"><span class="epp-xref A1">A1</span> <span class="gram"><a href="https://dictionary.cambridge.org/zhs/help/codes.html">[<span class="gcs"> <span class="gc">I</span> or <span class="gc">T</span> </span>]</a></span></span> <b class="def">to take <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%B9%81%E4%BD%93/hold" title="hold">hold</a> of something, <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%B9%81%E4%BD%93/especially" title="especially">especially</a> something that is <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%B9%81%E4%BD%93/moving" title="moving">moving</a> through the <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%B9%81%E4%BD%93/air" title="air">air</a></b></p><span class="def-body">
+ <span class="trans" lang="zh-Hant">抓住，接住</span>
+ <div class="examp emphasized"> <span class="eg">I <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%B9%81%E4%BD%93/manage" title="managed">managed</a> to catch the <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%B9%81%E4%BD%93/glass" title="glass">glass</a> before it <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%B9%81%E4%BD%93/hit" title="hit">hit</a> the <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%B9%81%E4%BD%93/ground" title="ground">ground</a>.</span>
+ <span class="trans" lang="zh-Hant">我在玻璃杯落地之前接住了它。</span>
+ </div><div class="examp emphasized"> <span class="eg">We <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%B9%81%E4%BD%93/saw" title="saw">saw</a> the <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%B9%81%E4%BD%93/eagle" title="eagle">eagle</a> <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%B9%81%E4%BD%93/swoop" title="swoop">swoop</a> from the <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%B9%81%E4%BD%93/sky" title="sky">sky</a> to catch <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%B9%81%E4%BD%93/its" title="its">its</a> <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%B9%81%E4%BD%93/prey" title="prey">prey</a>.</span>
+ <span class="trans" lang="zh-Hant">我們看到老鷹從空中猛撲下去抓捕獵物。</span>
+ </div><div class="examp emphasized"> <span class="eg">Our <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%B9%81%E4%BD%93/dog" title="dog">dog</a> <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%B9%81%E4%BD%93/ran" title="ran">ran</a> past me and out of the <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%B9%81%E4%BD%93/house" title="house">house</a> before I could catch it.</span>
+ <span class="trans" lang="zh-Hant">我們的狗從我身邊跑過，我沒抓住，讓它跑出了屋子。</span>
+ </div><div class="examp emphasized"> <span class="eg">He caught <span class="b"><a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%B9%81%E4%BD%93/hold" title="hold">hold</a></span> <span class="b">of</span> my <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%B9%81%E4%BD%93/arm" title="arm">arm</a>.</span>
+ <span class="trans" lang="zh-Hant">他一把抓住了我的胳膊。</span>
+ </div><div class="examp emphasized"> <span class="eg">We <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%B9%81%E4%BD%93/place" title="placed">placed</a> <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%B9%81%E4%BD%93/saucepan" title="saucepans">saucepans</a> on the <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%B9%81%E4%BD%93/floor" title="floor">floor</a> to catch <span class="gloss">(= <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%B9%81%E4%BD%93/collect" title="collect">collect</a>)</span> the <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%B9%81%E4%BD%93/drop" title="drops">drops</a> of <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%B9%81%E4%BD%93/water" title="water">water</a> coming through the <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%B9%81%E4%BD%93/roof" title="roof">roof</a>.</span>
+ <span class="trans" lang="zh-Hant">我們把平底鍋放在地上接屋頂漏下的水。</span>
+ </div><div class="examp emphasized"><span class="lab"><span class="region">UK</span> </span><span class="eg">The <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%B9%81%E4%BD%93/batsman" title="batsman">batsman</a> was caught <span class="b">(out)</span> <span class="gloss">(= someone in the other <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%B9%81%E4%BD%93/team" title="team">team</a> caught the <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%B9%81%E4%BD%93/ball" title="ball">ball</a> when he <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%B9%81%E4%BD%93/hit" title="hit">hit</a> it)</span>.</span>
+ <span class="trans" lang="zh-Hant">打擊手擊出的球被接住了。</span>
</div></span></div>
<div class="extraexamps"><p class="accord-basic js-accord accord-basic--shallow">更多范例</p><ul class="unstyled emphasized pad-indent"><li class="eg">Jenny <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%B9%81%E4%BD%93/stood" title="stood">stood</a> with her <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%B9%81%E4%BD%93/feet" title="feet">feet</a> <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%B9%81%E4%BD%93/slightly" title="slightly">slightly</a> <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%B9%81%E4%BD%93/apart" title="apart">apart</a>, <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%B9%81%E4%BD%93/ready" title="ready">ready</a> to catch the <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%B9%81%E4%BD%93/ball" title="ball">ball</a>.</li><li class="eg">He caught the <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%B9%81%E4%BD%93/rope" title="rope">rope</a> and <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%B9%81%E4%BD%93/knot" title="knotted">knotted</a> it around a <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%B9%81%E4%BD%93/post" title="post">post</a>.</li><li class="eg">She caught the <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%B9%81%E4%BD%93/ball" title="ball">ball</a> in <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%B9%81%E4%BD%93/mid-air" title="mid-air">mid-air</a>.</li><li class="eg">He caught me at the <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%B9%81%E4%BD%93/precise" title="precise">precise</a> <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%B9%81%E4%BD%93/moment" title="moment">moment</a> that I <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%B9%81%E4%BD%93/faint" title="fainted">fainted</a>.</li><li class="eg">She <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%B9%81%E4%BD%93/bought" title="bought">bought</a> a <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%B9%81%E4%BD%93/net" title="net">net</a> to catch <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%B9%81%E4%BD%93/butterfly" title="butterflies">butterflies</a>.</li></ul></div>
- </div>
-
- </div>
-
- <div class="sense-block" id="english-chinese-traditional-1-1-2">
+ </div> </div>
- <h3 class="txt-block txt-block--alt2"><span class="hw">catch</span> <span class="pos" title="A word that describes an action, condition or experience.">verb</span> <span class="guideword" title="Guide word: helps you find the right meaning when a word has more than one meaning">
+ <div class="sense-block" id="english-chinese-traditional-1-1-2"> <h3 class="txt-block txt-block--alt2"><span class="hw">catch</span> <span class="pos" title="A word that describes an action, condition or experience.">verb</span> <span class="guideword" title="Guide word: helps you find the right meaning when a word has more than one meaning">
(<span>STOP ESCAPING</span>)
- </span></h3>
- <div class="sense-body">
- <div class="def-block pad-indent" data-wl-senseid="ID_00004871_02"><p class="def-head semi-flush"><span class="def-info"><span title="B1: Intermediate level. English Vocabulary Profile symbols A1-C2 show which words and phrases learners know at each level." class="epp-xref B1">B1</span> <span class="gram"><a href="https://dictionary.cambridge.org/zhs/help/codes.html">[<span class="gcs"> <span title="Transitive verb: a verb that has an object." class="gc">T</span> </span>]</a></span></span> <b class="def">to <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%B9%81%E4%BD%93/find" title="find">find</a> and <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%B9%81%E4%BD%93/stop" title="stop">stop</a> a <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%B9%81%E4%BD%93/person" title="person">person</a> or <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%B9%81%E4%BD%93/animal" title="animal">animal</a> that is <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%B9%81%E4%BD%93/trying" title="trying">trying</a> to <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%B9%81%E4%BD%93/escape" title="escape">escape</a></b></p><span class="def-body">
- <span class="trans" lang="zh-Hant">
-
- 逮住，捉住</span>
- <div class="examp emphasized"> <span title="Example" class="eg">Great <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%B9%81%E4%BD%93/pressure" title="pressure">pressure</a> was put on the <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%B9%81%E4%BD%93/police" title="police">police</a> to catch the <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%B9%81%E4%BD%93/terrorist" title="terrorists">terrorists</a> as <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%B9%81%E4%BD%93/soon" title="soon">soon</a> as <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%B9%81%E4%BD%93/possible" title="possible">possible</a>.</span>
- <span class="trans" lang="zh-Hant">
-
- 警方面臨著很大的壓力，要盡早抓獲恐怖分子。</span>
- </div><div class="examp emphasized"> <span class="gram"><a href="https://dictionary.cambridge.org/zhs/help/codes.html">[<span class="gcs"> <span title="Followed by the 'ing' form of a verb." class="gc">+ -ing verb</span> </span>]</a></span> <span title="Example" class="eg">Two <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%B9%81%E4%BD%93/armed" title="armed">armed</a> men were caught <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%B9%81%E4%BD%93/try" title="try">try</a><span class="b">ing</span> to <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%B9%81%E4%BD%93/cross" title="cross">cross</a> the <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%B9%81%E4%BD%93/frontier" title="frontier">frontier</a> at <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%B9%81%E4%BD%93/night" title="night">night</a>.</span>
- <span class="trans" lang="zh-Hant">
-
- 兩名武裝分子企圖在夜間越境時被抓獲。</span>
- </div><div class="examp emphasized"> <span title="Example" class="eg">They were <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%B9%81%E4%BD%93/happy" title="happy">happy</a> because they had caught a lot of <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%B9%81%E4%BD%93/fish" title="fish">fish</a> that <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%B9%81%E4%BD%93/day" title="day">day</a>.</span>
- <span class="trans" lang="zh-Hant">
-
- 那天他們很高興，因為抓到了很多魚。</span>
- </div><div class="examp emphasized"><span title="If a word or phrase is used figuratively, it gives a picture of what sth is like." class="lab"><span title="If a word or phrase is used figuratively, it gives a picture of what sth is like." class="usage">figurative</span></span> <span title="Example" class="eg">I can <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%B9%81%E4%BD%93/see" title="see">see</a> you're <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%B9%81%E4%BD%93/busy" title="busy">busy</a> <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%B9%81%E4%BD%93/right" title="right">right</a> now, so I'll catch you <span class="gloss">(= <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%B9%81%E4%BD%93/speak" title="speak">speak</a> to you)</span> <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%B9%81%E4%BD%93/later" title="later">later</a>.</span>
- <span class="trans" lang="zh-Hant">
-
- 看得出你現在很忙，過一會兒再跟你說。</span>
+ </span></h3> <div class="sense-body">
+ <div class="def-block pad-indent" data-wl-senseid="ID_00004871_02"><p class="def-head semi-flush"><span class="def-info"><span class="epp-xref B1">B1</span> <span class="gram"><a href="https://dictionary.cambridge.org/zhs/help/codes.html">[<span class="gcs"> <span class="gc">T</span> </span>]</a></span></span> <b class="def">to <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%B9%81%E4%BD%93/find" title="find">find</a> and <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%B9%81%E4%BD%93/stop" title="stop">stop</a> a <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%B9%81%E4%BD%93/person" title="person">person</a> or <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%B9%81%E4%BD%93/animal" title="animal">animal</a> that is <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%B9%81%E4%BD%93/trying" title="trying">trying</a> to <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%B9%81%E4%BD%93/escape" title="escape">escape</a></b></p><span class="def-body">
+ <span class="trans" lang="zh-Hant">逮住，捉住</span>
+ <div class="examp emphasized"> <span class="eg">Great <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%B9%81%E4%BD%93/pressure" title="pressure">pressure</a> was put on the <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%B9%81%E4%BD%93/police" title="police">police</a> to catch the <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%B9%81%E4%BD%93/terrorist" title="terrorists">terrorists</a> as <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%B9%81%E4%BD%93/soon" title="soon">soon</a> as <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%B9%81%E4%BD%93/possible" title="possible">possible</a>.</span>
+ <span class="trans" lang="zh-Hant">警方面臨著很大的壓力，要盡早抓獲恐怖分子。</span>
+ </div><div class="examp emphasized"> <span class="gram"><a href="https://dictionary.cambridge.org/zhs/help/codes.html">[<span class="gcs"> <span class="gc">+ -ing verb</span> </span>]</a></span> <span class="eg">Two <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%B9%81%E4%BD%93/armed" title="armed">armed</a> men were caught <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%B9%81%E4%BD%93/try" title="try">try</a><span class="b">ing</span> to <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%B9%81%E4%BD%93/cross" title="cross">cross</a> the <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%B9%81%E4%BD%93/frontier" title="frontier">frontier</a> at <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%B9%81%E4%BD%93/night" title="night">night</a>.</span>
+ <span class="trans" lang="zh-Hant">兩名武裝分子企圖在夜間越境時被抓獲。</span>
+ </div><div class="examp emphasized"> <span class="eg">They were <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%B9%81%E4%BD%93/happy" title="happy">happy</a> because they had caught a lot of <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%B9%81%E4%BD%93/fish" title="fish">fish</a> that <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%B9%81%E4%BD%93/day" title="day">day</a>.</span>
+ <span class="trans" lang="zh-Hant">那天他們很高興，因為抓到了很多魚。</span>
+ </div><div class="examp emphasized"><span class="lab"><span class="usage">figurative</span></span> <span class="eg">I can <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%B9%81%E4%BD%93/see" title="see">see</a> you're <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%B9%81%E4%BD%93/busy" title="busy">busy</a> <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%B9%81%E4%BD%93/right" title="right">right</a> now, so I'll catch you <span class="gloss">(= <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%B9%81%E4%BD%93/speak" title="speak">speak</a> to you)</span> <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%B9%81%E4%BD%93/later" title="later">later</a>.</span>
+ <span class="trans" lang="zh-Hant">看得出你現在很忙，過一會兒再跟你說。</span>
</div></span></div>
<div class="extraexamps"><p class="accord-basic js-accord accord-basic--shallow">更多范例</p><ul class="unstyled emphasized pad-indent"><li class="eg">Police set up <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%B9%81%E4%BD%93/roadblock" title="roadblocks">roadblocks</a> on all <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%B9%81%E4%BD%93/road" title="roads">roads</a> out of the <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%B9%81%E4%BD%93/town" title="town">town</a> in an <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%B9%81%E4%BD%93/effort" title="effort">effort</a> to catch the <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%B9%81%E4%BD%93/bomber" title="bombers">bombers</a>.</li><li class="eg">Soldiers who <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%B9%81%E4%BD%93/deserted" title="deserted">deserted</a> and were caught were <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%B9%81%E4%BD%93/shot" title="shot">shot</a>.</li><li class="eg">The <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%B9%81%E4%BD%93/robber" title="robber">robber</a> was caught when someone <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%B9%81%E4%BD%93/tip" title="tipped">tipped</a> off the <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%B9%81%E4%BD%93/police" title="police">police</a>.</li><li class="eg">Thousands of <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%B9%81%E4%BD%93/illegal" title="illegal">illegal</a> <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%B9%81%E4%BD%93/immigrant" title="immigrants">immigrants</a> are caught and <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%B9%81%E4%BD%93/deport" title="deported">deported</a> every <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%B9%81%E4%BD%93/year" title="year">year</a>.</li><li class="eg">I caught the <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%B9%81%E4%BD%93/dog" title="dog">dog</a> by the <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%B9%81%E4%BD%93/collar" title="collar">collar</a> and <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%B9%81%E4%BD%93/drag" title="dragged">dragged</a> it out of the <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%B9%81%E4%BD%93/room" title="room">room</a>.</li></ul></div>
- </div>
-
- </div>
+ </div> </div>
- <div class="sense-block" id="english-chinese-traditional-1-1-3">
-
- <h3 class="txt-block txt-block--alt2"><span class="hw">catch</span> <span class="pos" title="A word that describes an action, condition or experience.">verb</span> <span class="guideword" title="Guide word: helps you find the right meaning when a word has more than one meaning">
+ <div class="sense-block" id="english-chinese-traditional-1-1-3"> <h3 class="txt-block txt-block--alt2"><span class="hw">catch</span> <span class="pos" title="A word that describes an action, condition or experience.">verb</span> <span class="guideword" title="Guide word: helps you find the right meaning when a word has more than one meaning">
(<span>NOTICE</span>)
- </span></h3>
- <div class="sense-body">
- <div class="def-block pad-indent" data-wl-senseid="ID_00004871_03"><p class="def-head semi-flush"><span class="def-info"><span title="B2: Upper-Intermediate level. English Vocabulary Profile symbols A1-C2 show which words and phrases learners know at each level." class="epp-xref B2">B2</span> <span class="gram"><a href="https://dictionary.cambridge.org/zhs/help/codes.html">[<span class="gcs"> <span title="Transitive verb: a verb that has an object." class="gc">T</span> </span>]</a></span></span> <b class="def">to <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%B9%81%E4%BD%93/discover" title="discover">discover</a>, <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%B9%81%E4%BD%93/see" title="see">see</a>, or <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%B9%81%E4%BD%93/realize" title="realize">realize</a> something, <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%B9%81%E4%BD%93/especially" title="especially">especially</a> someone doing something <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%B9%81%E4%BD%93/wrong" title="wrong">wrong</a></b></p><span class="def-body">
- <span class="trans" lang="zh-Hant">
-
- 發現，撞見，注意到</span>
- <div class="examp emphasized"> <span class="gram"><a href="https://dictionary.cambridge.org/zhs/help/codes.html">[<span class="gcs"> <span title="Followed by the 'ing' form of a verb." class="gc">+ -ing verb</span> </span>]</a></span> <span title="Example" class="eg">He caught her <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%B9%81%E4%BD%93/read" title="read">read</a><span class="b">ing</span> his <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%B9%81%E4%BD%93/old" title="old">old</a> <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%B9%81%E4%BD%93/love" title="love">love</a> <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%B9%81%E4%BD%93/letter" title="letters">letters</a>.</span>
- <span class="trans" lang="zh-Hant">
-
- 她看他過去的情書時被他撞見了。</span>
- </div><div class="examp emphasized"> <span title="Example" class="eg">If the <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%B9%81%E4%BD%93/virus" title="virus">virus</a> is caught <span class="gloss">(= <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%B9%81%E4%BD%93/discover" title="discovered">discovered</a>)</span> in <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%B9%81%E4%BD%93/time" title="time">time</a>, most <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%B9%81%E4%BD%93/patient" title="patients">patients</a> can be successfully <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%B9%81%E4%BD%93/treat" title="treated">treated</a>.</span>
- <span class="trans" lang="zh-Hant">
-
- 要是能及時發現病毒，大多數病患都可以治癒。</span>
- </div><div class="examp emphasized"> <span title="Example" class="eg">I caught <span class="b"><a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%B9%81%E4%BD%93/sight" title="sight">sight</a> of</span>/caught <span class="b">a <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%B9%81%E4%BD%93/glimpse" title="glimpse">glimpse</a> of</span> <span class="gloss">(= <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%B9%81%E4%BD%93/saw" title="saw">saw</a> for a <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%B9%81%E4%BD%93/moment" title="moment">moment</a>)</span> a <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%B9%81%E4%BD%93/red" title="red">red</a> <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%B9%81%E4%BD%93/coat" title="coat">coat</a> in the <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%B9%81%E4%BD%93/crowd" title="crowd">crowd</a>.</span>
- <span class="trans" lang="zh-Hant">
-
- 我在人群中看到／瞥見一個穿紅色外套的人。</span>
+ </span></h3> <div class="sense-body">
+ <div class="def-block pad-indent" data-wl-senseid="ID_00004871_03"><p class="def-head semi-flush"><span class="def-info"><span class="epp-xref B2">B2</span> <span class="gram"><a href="https://dictionary.cambridge.org/zhs/help/codes.html">[<span class="gcs"> <span class="gc">T</span> </span>]</a></span></span> <b class="def">to <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%B9%81%E4%BD%93/discover" title="discover">discover</a>, <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%B9%81%E4%BD%93/see" title="see">see</a>, or <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%B9%81%E4%BD%93/realize" title="realize">realize</a> something, <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%B9%81%E4%BD%93/especially" title="especially">especially</a> someone doing something <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%B9%81%E4%BD%93/wrong" title="wrong">wrong</a></b></p><span class="def-body">
+ <span class="trans" lang="zh-Hant">發現，撞見，注意到</span>
+ <div class="examp emphasized"> <span class="gram"><a href="https://dictionary.cambridge.org/zhs/help/codes.html">[<span class="gcs"> <span class="gc">+ -ing verb</span> </span>]</a></span> <span class="eg">He caught her <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%B9%81%E4%BD%93/read" title="read">read</a><span class="b">ing</span> his <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%B9%81%E4%BD%93/old" title="old">old</a> <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%B9%81%E4%BD%93/love" title="love">love</a> <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%B9%81%E4%BD%93/letter" title="letters">letters</a>.</span>
+ <span class="trans" lang="zh-Hant">她看他過去的情書時被他撞見了。</span>
+ </div><div class="examp emphasized"> <span class="eg">If the <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%B9%81%E4%BD%93/virus" title="virus">virus</a> is caught <span class="gloss">(= <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%B9%81%E4%BD%93/discover" title="discovered">discovered</a>)</span> in <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%B9%81%E4%BD%93/time" title="time">time</a>, most <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%B9%81%E4%BD%93/patient" title="patients">patients</a> can be successfully <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%B9%81%E4%BD%93/treat" title="treated">treated</a>.</span>
+ <span class="trans" lang="zh-Hant">要是能及時發現病毒，大多數病患都可以治癒。</span>
+ </div><div class="examp emphasized"> <span class="eg">I caught <span class="b"><a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%B9%81%E4%BD%93/sight" title="sight">sight</a> of</span>/caught <span class="b">a <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%B9%81%E4%BD%93/glimpse" title="glimpse">glimpse</a> of</span> <span class="gloss">(= <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%B9%81%E4%BD%93/saw" title="saw">saw</a> for a <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%B9%81%E4%BD%93/moment" title="moment">moment</a>)</span> a <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%B9%81%E4%BD%93/red" title="red">red</a> <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%B9%81%E4%BD%93/coat" title="coat">coat</a> in the <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%B9%81%E4%BD%93/crowd" title="crowd">crowd</a>.</span>
+ <span class="trans" lang="zh-Hant">我在人群中看到／瞥見一個穿紅色外套的人。</span>
</div></span></div>
- <div class="phrase-block pad-indent"><span class="phrase-head"><span title="Phrase" class="phrase-title"><span class="phrase">catch <span class="obj">sb's</span> attention, imagination, interest, etc.</span></span></span><div class="phrase-body pad-indent">
- <div class="def-block pad-indent" data-wl-senseid="ID_00004871_04"><p class="def-head semi-flush"><span class="def-info"><span title="B2: Upper-Intermediate level. English Vocabulary Profile symbols A1-C2 show which words and phrases learners know at each level." class="epp-xref B2">B2</span> </span><b class="def">to make someone <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%B9%81%E4%BD%93/notice" title="notice">notice</a> something and <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%B9%81%E4%BD%93/feel" title="feel">feel</a> <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%B9%81%E4%BD%93/interested" title="interested">interested</a></b></p><span class="def-body">
- <span class="trans" lang="zh-Hant">
-
- 引起…的注意（想像，興趣等）</span>
- <div class="examp emphasized"> <span title="Example" class="eg">A <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%B9%81%E4%BD%93/ship" title="ship">ship</a> out at <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%B9%81%E4%BD%93/sea" title="sea">sea</a> caught his <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%B9%81%E4%BD%93/attention" title="attention">attention</a>.</span>
- <span class="trans" lang="zh-Hant">
-
- 一艘出海的船吸引了他的注意。</span>
- </div><div class="examp emphasized"> <span title="Example" class="eg">Her <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%B9%81%E4%BD%93/picture" title="pictures">pictures</a> caught my <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%B9%81%E4%BD%93/imagination" title="imagination">imagination</a>.</span>
- <span class="trans" lang="zh-Hant">
-
- 她的照片引起了我的遐想。</span>
+ <div class="phrase-block pad-indent"><span class="phrase-head"><span class="phrase-title"><span class="phrase">catch <span class="obj">sb's</span> attention, imagination, interest, etc.</span></span></span><div class="phrase-body pad-indent">
+ <div class="def-block pad-indent" data-wl-senseid="ID_00004871_04"><p class="def-head semi-flush"><span class="def-info"><span class="epp-xref B2">B2</span> </span><b class="def">to make someone <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%B9%81%E4%BD%93/notice" title="notice">notice</a> something and <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%B9%81%E4%BD%93/feel" title="feel">feel</a> <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%B9%81%E4%BD%93/interested" title="interested">interested</a></b></p><span class="def-body">
+ <span class="trans" lang="zh-Hant">引起…的注意（想像，興趣等）</span>
+ <div class="examp emphasized"> <span class="eg">A <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%B9%81%E4%BD%93/ship" title="ship">ship</a> out at <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%B9%81%E4%BD%93/sea" title="sea">sea</a> caught his <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%B9%81%E4%BD%93/attention" title="attention">attention</a>.</span>
+ <span class="trans" lang="zh-Hant">一艘出海的船吸引了他的注意。</span>
+ </div><div class="examp emphasized"> <span class="eg">Her <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%B9%81%E4%BD%93/picture" title="pictures">pictures</a> caught my <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%B9%81%E4%BD%93/imagination" title="imagination">imagination</a>.</span>
+ <span class="trans" lang="zh-Hant">她的照片引起了我的遐想。</span>
</div></span></div>
- </div></div><div class="phrase-block pad-indent"><span class="phrase-head"><span title="Phrase" class="phrase-title"><span class="phrase">be caught without <span title="sth: abbreviation for something." class="obj">sth</span></span></span></span><div class="phrase-body pad-indent">
+ </div></div><div class="phrase-block pad-indent"><span class="phrase-head"><span class="phrase-title"><span class="phrase">be caught without <span class="obj">sth</span></span></span></span><div class="phrase-body pad-indent">
<div class="def-block pad-indent" data-wl-senseid="ID_00004871_05"><p class="def-head semi-flush"><span class="def-info"><span class="freq">›</span> </span><b class="def">to not have something, <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%B9%81%E4%BD%93/especially" title="especially">especially</a> when it is <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%B9%81%E4%BD%93/needed" title="needed">needed</a></b></p><span class="def-body">
- <span class="trans" lang="zh-Hant">
-
- （尤指在需要的時候）沒有，缺乏</span>
- <div class="examp emphasized"> <span title="Example" class="eg">He doesn't like to be caught without any <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%B9%81%E4%BD%93/biscuit" title="biscuits">biscuits</a> in the <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%B9%81%E4%BD%93/house" title="house">house</a>.</span>
- <span class="trans" lang="zh-Hant">
-
- 他喜歡家裡備些餅乾。</span>
+ <span class="trans" lang="zh-Hant">（尤指在需要的時候）沒有，缺乏</span>
+ <div class="examp emphasized"> <span class="eg">He doesn't like to be caught without any <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%B9%81%E4%BD%93/biscuit" title="biscuits">biscuits</a> in the <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%B9%81%E4%BD%93/house" title="house">house</a>.</span>
+ <span class="trans" lang="zh-Hant">他喜歡家裡備些餅乾。</span>
</div></span></div>
- </div></div><div class="phrase-block pad-indent"><span class="phrase-head"><span title="Phrase" class="phrase-title"><span class="phrase">you won't catch <span class="obj">sb doing sth</span></span></span></span><div class="phrase-body pad-indent">
+ </div></div><div class="phrase-block pad-indent"><span class="phrase-head"><span class="phrase-title"><span class="phrase">you won't catch <span class="obj">sb doing sth</span></span></span></span><div class="phrase-body pad-indent">
<div class="def-block pad-indent" data-wl-senseid="ID_00004871_06"><p class="def-head semi-flush"><span class="def-info"><span class="freq">›</span> </span><b class="def">said to <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%B9%81%E4%BD%93/mean" title="mean">mean</a> that you will <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%B9%81%E4%BD%93/certainly" title="certainly">certainly</a> not <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%B9%81%E4%BD%93/see" title="see">see</a> someone doing a <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%B9%81%E4%BD%93/particular" title="particular">particular</a> thing or in a <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%B9%81%E4%BD%93/particular" title="particular">particular</a> <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%B9%81%E4%BD%93/place" title="place">place</a></b></p><span class="def-body">
- <span class="trans" lang="zh-Hant">
-
- 別指望…會做；…不會做</span>
- <div class="examp emphasized"> <span title="Example" class="eg">You won't catch me at <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%B9%81%E4%BD%93/work" title="work">work</a> after four o'clock.</span>
- <span class="trans" lang="zh-Hant">
-
- 別指望我四點以後工作。</span>
- </div><div class="examp emphasized"> <span title="Example" class="eg">You won't catch Carla <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%B9%81%E4%BD%93/eat" title="eating">eating</a> in a <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%B9%81%E4%BD%93/cheap" title="cheap">cheap</a> <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%B9%81%E4%BD%93/restaurant" title="restaurant">restaurant</a>, oh no.</span>
- <span class="trans" lang="zh-Hant">
-
- 卡拉不可能在便宜的餐館吃飯，不可能的。</span>
+ <span class="trans" lang="zh-Hant">別指望…會做；…不會做</span>
+ <div class="examp emphasized"> <span class="eg">You won't catch me at <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%B9%81%E4%BD%93/work" title="work">work</a> after four o'clock.</span>
+ <span class="trans" lang="zh-Hant">別指望我四點以後工作。</span>
+ </div><div class="examp emphasized"> <span class="eg">You won't catch Carla <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%B9%81%E4%BD%93/eat" title="eating">eating</a> in a <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%B9%81%E4%BD%93/cheap" title="cheap">cheap</a> <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%B9%81%E4%BD%93/restaurant" title="restaurant">restaurant</a>, oh no.</span>
+ <span class="trans" lang="zh-Hant">卡拉不可能在便宜的餐館吃飯，不可能的。</span>
</div></span></div>
- </div></div>
+ </div></div>
<div class="extraexamps"><p class="accord-basic js-accord accord-basic--shallow">更多范例</p><ul class="unstyled emphasized pad-indent"><li class="eg">She was <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%B9%81%E4%BD%93/fire" title="fired">fired</a> after she was caught <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%B9%81%E4%BD%93/steal" title="stealing">stealing</a> from her <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%B9%81%E4%BD%93/employer" title="employer">employer</a>.</li><li class="eg">She was caught <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%B9%81%E4%BD%93/driving" title="driving">driving</a> at 120 <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%B9%81%E4%BD%93/mph" title="mph">mph</a>.</li><li class="eg">I caught him <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%B9%81%E4%BD%93/look" title="looking">looking</a> through my <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%B9%81%E4%BD%93/private" title="private">private</a> <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%B9%81%E4%BD%93/paper" title="papers">papers</a>.</li><li class="eg">He caught me <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%B9%81%E4%BD%93/stare" title="staring">staring</a> out of the <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%B9%81%E4%BD%93/window" title="window">window</a>.</li><li class="eg">It's <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%B9%81%E4%BD%93/embarrassing" title="embarrassing">embarrassing</a> to be caught <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%B9%81%E4%BD%93/telling" title="telling">telling</a> a <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%B9%81%E4%BD%93/lie" title="lie">lie</a>.</li></ul></div>
</div>
+ <div id='ad_contentslot_1' class='am-default contentslot'>
+ <script type='text/javascript'>
+ googletag.cmd.push(function() { googletag.display('ad_contentslot_1'); });
+ </script>
+ </div>
+ </div>
- </div>
-
- <div class="sense-block" id="english-chinese-traditional-1-1-4">
-
- <h3 class="txt-block txt-block--alt2"><span class="hw">catch</span> <span class="pos" title="A word that describes an action, condition or experience.">verb</span> <span class="guideword" title="Guide word: helps you find the right meaning when a word has more than one meaning">
+ <div class="sense-block" id="english-chinese-traditional-1-1-4"> <h3 class="txt-block txt-block--alt2"><span class="hw">catch</span> <span class="pos" title="A word that describes an action, condition or experience.">verb</span> <span class="guideword" title="Guide word: helps you find the right meaning when a word has more than one meaning">
(<span>TRAVEL</span>)
- </span></h3>
- <div class="sense-body">
- <div class="def-block pad-indent" data-wl-senseid="ID_00004871_07"><p class="def-head semi-flush"><span class="def-info"><span class="epp-xref A1" title="A1: Beginner level. English Vocabulary Profile symbols A1-C2 show which words and phrases learners know at each level.">A1</span> <span class="gram"><a href="https://dictionary.cambridge.org/zhs/help/codes.html">[<span class="gcs"> <span title="Transitive verb: a verb that has an object." class="gc">T</span> </span>]</a></span></span> <b class="def">to <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%B9%81%E4%BD%93/travel" title="travel">travel</a> or be <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%B9%81%E4%BD%93/able" title="able">able</a> to <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%B9%81%E4%BD%93/travel" title="travel">travel</a> on an <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%B9%81%E4%BD%93/aircraft" title="aircraft">aircraft</a>, <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%B9%81%E4%BD%93/train" title="train">train</a>, <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%B9%81%E4%BD%93/bus" title="bus">bus</a>, etc.</b></p><span class="def-body">
- <span class="trans" lang="zh-Hant">
-
- 趕，乘，搭乘（飛機、火車、公共汽車等）</span>
- <div class="examp emphasized"> <span title="Example" class="eg">He always catches the 10.30 a.m. <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%B9%81%E4%BD%93/train" title="train">train</a> to <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%B9%81%E4%BD%93/work" title="work">work</a>.</span>
- <span class="trans" lang="zh-Hant">
-
- 他總是乘上午10點30分的那班火車上班。</span>
- </div><div class="examp emphasized"> <span title="Example" class="eg">She was <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%B9%81%E4%BD%93/worried" title="worried">worried</a> that she'd <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%B9%81%E4%BD%93/arrive" title="arrive">arrive</a> too late to catch the last <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%B9%81%E4%BD%93/bus" title="bus">bus</a> <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%B9%81%E4%BD%93/home" title="home">home</a>.</span>
- <span class="trans" lang="zh-Hant">
-
- 她擔心到得太晚，趕不上回家的末班車。</span>
+ </span></h3> <div class="sense-body">
+ <div class="def-block pad-indent" data-wl-senseid="ID_00004871_07"><p class="def-head semi-flush"><span class="def-info"><span class="epp-xref A1">A1</span> <span class="gram"><a href="https://dictionary.cambridge.org/zhs/help/codes.html">[<span class="gcs"> <span class="gc">T</span> </span>]</a></span></span> <b class="def">to <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%B9%81%E4%BD%93/travel" title="travel">travel</a> or be <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%B9%81%E4%BD%93/able" title="able">able</a> to <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%B9%81%E4%BD%93/travel" title="travel">travel</a> on an <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%B9%81%E4%BD%93/aircraft" title="aircraft">aircraft</a>, <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%B9%81%E4%BD%93/train" title="train">train</a>, <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%B9%81%E4%BD%93/bus" title="bus">bus</a>, etc.</b></p><span class="def-body">
+ <span class="trans" lang="zh-Hant">趕，乘，搭乘（飛機、火車、公共汽車等）</span>
+ <div class="examp emphasized"> <span class="eg">He always catches the 10.30 a.m. <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%B9%81%E4%BD%93/train" title="train">train</a> to <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%B9%81%E4%BD%93/work" title="work">work</a>.</span>
+ <span class="trans" lang="zh-Hant">他總是乘上午10點30分的那班火車上班。</span>
+ </div><div class="examp emphasized"> <span class="eg">She was <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%B9%81%E4%BD%93/worried" title="worried">worried</a> that she'd <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%B9%81%E4%BD%93/arrive" title="arrive">arrive</a> too late to catch the last <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%B9%81%E4%BD%93/bus" title="bus">bus</a> <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%B9%81%E4%BD%93/home" title="home">home</a>.</span>
+ <span class="trans" lang="zh-Hant">她擔心到得太晚，趕不上回家的末班車。</span>
</div></span></div>
<div class="extraexamps"><p class="accord-basic js-accord accord-basic--shallow">更多范例</p><ul class="unstyled emphasized pad-indent"><li class="eg">If we don't <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%B9%81%E4%BD%93/hurry" title="hurry">hurry</a> up, we won't be in <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%B9%81%E4%BD%93/time" title="time">time</a> to catch the <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%B9%81%E4%BD%93/train" title="train">train</a>.</li><li class="eg">We <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%B9%81%E4%BD%93/arrive" title="arrived">arrived</a> at the <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%B9%81%E4%BD%93/airport" title="airport">airport</a> just in <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%B9%81%E4%BD%93/time" title="time">time</a> to catch the <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%B9%81%E4%BD%93/plane" title="plane">plane</a>.</li><li class="eg">We caught the <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%B9%81%E4%BD%93/ferry" title="ferry">ferry</a> <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%B9%81%E4%BD%93/across" title="across">across</a> to Ireland.</li><li class="eg">We caught the <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%B9%81%E4%BD%93/overnight" title="overnight">overnight</a> <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%B9%81%E4%BD%93/flight" title="flight">flight</a> from LA and got to New York at five this <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%B9%81%E4%BD%93/morning" title="morning">morning</a>.</li><li class="eg">She caught the <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%B9%81%E4%BD%93/train" title="train">train</a> to Edinburgh.</li></ul></div>
- </div>
-
- </div>
-
- <div class="sense-block" id="english-chinese-traditional-1-1-5">
+ </div> </div>
- <h3 class="txt-block txt-block--alt2"><span class="hw">catch</span> <span class="pos" title="A word that describes an action, condition or experience.">verb</span> <span class="guideword" title="Guide word: helps you find the right meaning when a word has more than one meaning">
+ <div class="sense-block" id="english-chinese-traditional-1-1-5"> <h3 class="txt-block txt-block--alt2"><span class="hw">catch</span> <span class="pos" title="A word that describes an action, condition or experience.">verb</span> <span class="guideword" title="Guide word: helps you find the right meaning when a word has more than one meaning">
(<span>BECOME INFECTED</span>)
- </span></h3>
- <div class="sense-body">
- <div class="def-block pad-indent" data-wl-senseid="ID_00004871_08"><p class="def-head semi-flush"><span class="def-info"><span title="A2: Elementary level. English Vocabulary Profile symbols A1-C2 show which words and phrases learners know at each level." class="epp-xref A2">A2</span> <span class="gram"><a href="https://dictionary.cambridge.org/zhs/help/codes.html">[<span class="gcs"> <span title="Transitive verb: a verb that has an object." class="gc">T</span> </span>]</a></span></span> <b class="def">to get an <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%B9%81%E4%BD%93/illness" title="illness">illness</a>, <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%B9%81%E4%BD%93/especially" title="especially">especially</a> one <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%B9%81%E4%BD%93/cause" title="caused">caused</a> by <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%B9%81%E4%BD%93/bacteria" title="bacteria">bacteria</a> or a <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%B9%81%E4%BD%93/virus" title="virus">virus</a></b></p><span class="def-body">
- <span class="trans" lang="zh-Hant">
-
- （尤指因感染細菌或病毒）罹患（病），染（疾）</span>
- <div class="examp emphasized"> <span title="Example" class="eg">He caught <span class="b">a <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%B9%81%E4%BD%93/cold" title="cold">cold</a></span> on <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%B9%81%E4%BD%93/holiday" title="holiday">holiday</a>.</span>
- <span class="trans" lang="zh-Hant">
-
- 他度假時感冒了。</span>
- </div><div class="examp emphasized"> <span title="Example" class="eg">A lot of <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%B9%81%E4%BD%93/children" title="children">children</a> in the <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%B9%81%E4%BD%93/school" title="school">school</a> caught <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%B9%81%E4%BD%93/measles" title="measles">measles</a> last <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%B9%81%E4%BD%93/term" title="term">term</a>.</span>
- <span class="trans" lang="zh-Hant">
-
- 上學期許多在校的孩子得了麻疹。</span>
+ </span></h3> <div class="sense-body">
+ <div class="def-block pad-indent" data-wl-senseid="ID_00004871_08"><p class="def-head semi-flush"><span class="def-info"><span class="epp-xref A2">A2</span> <span class="gram"><a href="https://dictionary.cambridge.org/zhs/help/codes.html">[<span class="gcs"> <span class="gc">T</span> </span>]</a></span></span> <b class="def">to get an <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%B9%81%E4%BD%93/illness" title="illness">illness</a>, <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%B9%81%E4%BD%93/especially" title="especially">especially</a> one <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%B9%81%E4%BD%93/cause" title="caused">caused</a> by <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%B9%81%E4%BD%93/bacteria" title="bacteria">bacteria</a> or a <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%B9%81%E4%BD%93/virus" title="virus">virus</a></b></p><span class="def-body">
+ <span class="trans" lang="zh-Hant">（尤指因感染細菌或病毒）罹患（病），染（疾）</span>
+ <div class="examp emphasized"> <span class="eg">He caught <span class="b">a <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%B9%81%E4%BD%93/cold" title="cold">cold</a></span> on <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%B9%81%E4%BD%93/holiday" title="holiday">holiday</a>.</span>
+ <span class="trans" lang="zh-Hant">他度假時感冒了。</span>
+ </div><div class="examp emphasized"> <span class="eg">A lot of <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%B9%81%E4%BD%93/children" title="children">children</a> in the <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%B9%81%E4%BD%93/school" title="school">school</a> caught <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%B9%81%E4%BD%93/measles" title="measles">measles</a> last <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%B9%81%E4%BD%93/term" title="term">term</a>.</span>
+ <span class="trans" lang="zh-Hant">上學期許多在校的孩子得了麻疹。</span>
</div></span></div>
<div class="extraexamps"><p class="accord-basic js-accord accord-basic--shallow">更多范例</p><ul class="unstyled emphasized pad-indent"><li class="eg">Don't come too near me - you might catch my <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%B9%81%E4%BD%93/cold" title="cold">cold</a>.</li><li class="eg">Don't go out with <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%B9%81%E4%BD%93/wet" title="wet">wet</a> <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%B9%81%E4%BD%93/hair" title="hair">hair</a>, you might catch a <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%B9%81%E4%BD%93/chill" title="chill">chill</a>.</li><li class="eg">I'm <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%B9%81%E4%BD%93/feeling" title="feeling">feeling</a> a <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%B9%81%E4%BD%93/bit" title="bit">bit</a> <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%B9%81%E4%BD%93/feverish" title="feverish">feverish</a> - I <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%B9%81%E4%BD%93/hope" title="hope">hope</a> I haven't caught the <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%B9%81%E4%BD%93/flu" title="flu">flu</a>.</li><li class="eg">I don't <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%B9%81%E4%BD%93/know" title="know">know</a> <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%B9%81%E4%BD%93/exactly" title="exactly">exactly</a> what's <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%B9%81%E4%BD%93/wrong" title="wrong">wrong</a> with her - she's caught some <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%B9%81%E4%BD%93/sort" title="sort">sort</a> of <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%B9%81%E4%BD%93/virus" title="virus">virus</a>.</li><li class="eg">A lot of <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%B9%81%E4%BD%93/children" title="children">children</a> in the <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%B9%81%E4%BD%93/school" title="school">school</a> caught <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%B9%81%E4%BD%93/measles" title="measles">measles</a> last <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%B9%81%E4%BD%93/term" title="term">term</a>.</li></ul></div>
- </div>
-
+ </div> </div>
- <div id='ad_contentslot_1' class='am-default contentslot'>
+ <div class="sense-block" id="english-chinese-traditional-1-1-6"> <h3 class="txt-block txt-block--alt2"><span class="hw">catch</span> <span class="pos" title="A word that describes an action, condition or experience.">verb</span> <span class="guideword" title="Guide word: helps you find the right meaning when a word has more than one meaning">
+ (<span>STICK</span>)
+ </span></h3> <div class="sense-body">
+ <div class="def-block pad-indent" data-wl-senseid="ID_00004871_09"><p class="def-head semi-flush"><span class="def-info"><span class="epp-xref C2">C2</span> <span class="gram"><a href="https://dictionary.cambridge.org/zhs/help/codes.html">[<span class="gcs"> <span class="gc">I</span> or <span class="gc">T</span> </span>]</a></span></span> <b class="def">to <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%B9%81%E4%BD%93/stick" title="stick">stick</a> <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%B9%81%E4%BD%93/somewhere" title="somewhere">somewhere</a>, or to make something <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%B9%81%E4%BD%93/stick" title="stick">stick</a> <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%B9%81%E4%BD%93/somewhere" title="somewhere">somewhere</a></b></p><span class="def-body">
+ <span class="trans" lang="zh-Hant">（使）掛住，鉤住，卡住</span>
+ <div class="examp emphasized"> <span class="eg">The <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%B9%81%E4%BD%93/sleeve" title="sleeve">sleeve</a> of my <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%B9%81%E4%BD%93/jacket" title="jacket">jacket</a> (got) caught <span class="b">on</span> the <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%B9%81%E4%BD%93/door" title="door">door</a> <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%B9%81%E4%BD%93/handle" title="handle">handle</a> and <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%B9%81%E4%BD%93/ripped" title="ripped">ripped</a>.</span>
+ <span class="trans" lang="zh-Hant">我的夾克衫的袖子鉤在門把手上，給扯破了。</span>
+ </div><div class="examp emphasized"> <span class="eg">Her <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%B9%81%E4%BD%93/hair" title="hair">hair</a> got caught <span class="b">(up) in</span> her <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%B9%81%E4%BD%93/hairdryer" title="hairdryer">hairdryer</a>.</span>
+ <span class="trans" lang="zh-Hant">她的頭髮纏在了吹風機上。</span>
+ </div></span></div>
+ </div>
+ <div id='ad_contentslot_2' class='am-default contentslot'>
<script type='text/javascript'>
- googletag.cmd.push(function() { googletag.display('ad_contentslot_1'); });
+ googletag.cmd.push(function() { googletag.display('ad_contentslot_2'); });
</script>
</div>
- </div>
-
- <div class="sense-block" id="english-chinese-traditional-1-1-6">
-
- <h3 class="txt-block txt-block--alt2"><span class="hw">catch</span> <span class="pos" title="A word that describes an action, condition or experience.">verb</span> <span class="guideword" title="Guide word: helps you find the right meaning when a word has more than one meaning">
- (<span>STICK</span>)
- </span></h3>
- <div class="sense-body">
- <div class="def-block pad-indent" data-wl-senseid="ID_00004871_09"><p class="def-head semi-flush"><span class="def-info"><span title="C2: Proficiency level. English Vocabulary Profile symbols A1-C2 show which words and phrases learners know at each level." class="epp-xref C2">C2</span> <span class="gram"><a href="https://dictionary.cambridge.org/zhs/help/codes.html">[<span class="gcs"> <span title="Intransitive verb: a verb that has no object." class="gc">I</span> or <span title="Transitive verb: a verb that has an object." class="gc">T</span> </span>]</a></span></span> <b class="def">to <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%B9%81%E4%BD%93/stick" title="stick">stick</a> <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%B9%81%E4%BD%93/somewhere" title="somewhere">somewhere</a>, or to make something <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%B9%81%E4%BD%93/stick" title="stick">stick</a> <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%B9%81%E4%BD%93/somewhere" title="somewhere">somewhere</a></b></p><span class="def-body">
- <span class="trans" lang="zh-Hant">
+ </div>
- （使）掛住，鉤住，卡住</span>
- <div class="examp emphasized"> <span title="Example" class="eg">The <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%B9%81%E4%BD%93/sleeve" title="sleeve">sleeve</a> of my <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%B9%81%E4%BD%93/jacket" title="jacket">jacket</a> (got) caught <span class="b">on</span> the <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%B9%81%E4%BD%93/door" title="door">door</a> <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%B9%81%E4%BD%93/handle" title="handle">handle</a> and <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%B9%81%E4%BD%93/ripped" title="ripped">ripped</a>.</span>
- <span class="trans" lang="zh-Hant">
-
- 我的夾克衫的袖子鉤在門把手上，給扯破了。</span>
- </div><div class="examp emphasized"> <span title="Example" class="eg">Her <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%B9%81%E4%BD%93/hair" title="hair">hair</a> got caught <span class="b">(up) in</span> her <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%B9%81%E4%BD%93/hairdryer" title="hairdryer">hairdryer</a>.</span>
- <span class="trans" lang="zh-Hant">
-
- 她的頭髮纏在了吹風機上。</span>
- </div></span></div>
- </div>
-
- </div>
-
- <div class="sense-block" id="english-chinese-traditional-1-1-7">
-
- <h3 class="txt-block txt-block--alt2"><span class="hw">catch</span> <span class="pos" title="A word that describes an action, condition or experience.">verb</span> <span class="guideword" title="Guide word: helps you find the right meaning when a word has more than one meaning">
+ <div class="sense-block" id="english-chinese-traditional-1-1-7"> <h3 class="txt-block txt-block--alt2"><span class="hw">catch</span> <span class="pos" title="A word that describes an action, condition or experience.">verb</span> <span class="guideword" title="Guide word: helps you find the right meaning when a word has more than one meaning">
(<span>BE IN TIME</span>)
- </span></h3>
- <div class="sense-body">
- <div class="def-block pad-indent" data-wl-senseid="ID_00004871_10"><p class="def-head semi-flush"><span class="def-info"><span class="freq">›</span> <span class="gram"><a href="https://dictionary.cambridge.org/zhs/help/codes.html">[<span class="gcs"> <span title="Transitive verb: a verb that has an object." class="gc">T</span> </span>]</a></span></span> <b class="def">to <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%B9%81%E4%BD%93/manage" title="manage">manage</a> to be in <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%B9%81%E4%BD%93/time" title="time">time</a> to <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%B9%81%E4%BD%93/see" title="see">see</a> or do something</b></p><span class="def-body">
- <span class="trans" lang="zh-Hant">
-
- 及時趕上</span>
- <div class="examp emphasized"> <span title="Example" class="eg">I went <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%B9%81%E4%BD%93/home" title="home">home</a> early to catch the <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%B9%81%E4%BD%93/beginning" title="beginning">beginning</a> of the <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%B9%81%E4%BD%93/programme" title="programme">programme</a>.</span>
- <span class="trans" lang="zh-Hant">
-
- 為了看到節目的開頭，我就稍微早了一點回家。</span>
- </div><div class="examp emphasized"> <span title="Example" class="eg">You'll have to <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%B9%81%E4%BD%93/run" title="run">run</a> if you <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%B9%81%E4%BD%93/want" title="want">want</a> to catch <strong class="cl">the <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%B9%81%E4%BD%93/post" title="post">post</a></strong> <span class="gloss">(= <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%B9%81%E4%BD%93/send" title="send">send</a> a <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%B9%81%E4%BD%93/letter" title="letter">letter</a> before the <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%B9%81%E4%BD%93/post" title="post">post</a> has been <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%B9%81%E4%BD%93/collected" title="collected">collected</a>)</span>.</span>
- <span class="trans" lang="zh-Hant">
-
- 要是你想趕得上寄信，就得趕緊了。</span>
+ </span></h3> <div class="sense-body">
+ <div class="def-block pad-indent" data-wl-senseid="ID_00004871_10"><p class="def-head semi-flush"><span class="def-info"><span class="freq">›</span> <span class="gram"><a href="https://dictionary.cambridge.org/zhs/help/codes.html">[<span class="gcs"> <span class="gc">T</span> </span>]</a></span></span> <b class="def">to <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%B9%81%E4%BD%93/manage" title="manage">manage</a> to be in <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%B9%81%E4%BD%93/time" title="time">time</a> to <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%B9%81%E4%BD%93/see" title="see">see</a> or do something</b></p><span class="def-body">
+ <span class="trans" lang="zh-Hant">及時趕上</span>
+ <div class="examp emphasized"> <span class="eg">I went <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%B9%81%E4%BD%93/home" title="home">home</a> early to catch the <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%B9%81%E4%BD%93/beginning" title="beginning">beginning</a> of the <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%B9%81%E4%BD%93/programme" title="programme">programme</a>.</span>
+ <span class="trans" lang="zh-Hant">為了看到節目的開頭，我就稍微早了一點回家。</span>
+ </div><div class="examp emphasized"> <span class="eg">You'll have to <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%B9%81%E4%BD%93/run" title="run">run</a> if you <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%B9%81%E4%BD%93/want" title="want">want</a> to catch <strong class="cl">the <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%B9%81%E4%BD%93/post" title="post">post</a></strong> <span class="gloss">(= <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%B9%81%E4%BD%93/send" title="send">send</a> a <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%B9%81%E4%BD%93/letter" title="letter">letter</a> before the <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%B9%81%E4%BD%93/post" title="post">post</a> has been <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%B9%81%E4%BD%93/collected" title="collected">collected</a>)</span>.</span>
+ <span class="trans" lang="zh-Hant">要是你想趕得上寄信，就得趕緊了。</span>
</div></span></div>
- </div>
+ </div> </div>
- </div>
-
- <div class="sense-block" id="english-chinese-traditional-1-1-8">
-
- <h3 class="txt-block txt-block--alt2"><span class="hw">catch</span> <span class="pos" title="A word that describes an action, condition or experience.">verb</span> <span class="guideword" title="Guide word: helps you find the right meaning when a word has more than one meaning">
+ <div class="sense-block" id="english-chinese-traditional-1-1-8"> <h3 class="txt-block txt-block--alt2"><span class="hw">catch</span> <span class="pos" title="A word that describes an action, condition or experience.">verb</span> <span class="guideword" title="Guide word: helps you find the right meaning when a word has more than one meaning">
(<span>HEAR/SEE</span>)
- </span></h3>
- <div class="sense-body">
- <div class="def-block pad-indent" data-wl-senseid="ID_00004871_11"><p class="def-head semi-flush"><span class="def-info"><span class="freq">›</span> <span class="gram"><a href="https://dictionary.cambridge.org/zhs/help/codes.html">[<span class="gcs"> <span title="Transitive verb: a verb that has an object." class="gc">T</span> </span>]</a></span></span> <b class="def">to <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%B9%81%E4%BD%93/manage" title="manage">manage</a> to <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%B9%81%E4%BD%93/hear" title="hear">hear</a> something</b></p><span class="def-body">
- <span class="trans" lang="zh-Hant">
-
- 聽見，聽到</span>
- <div class="examp emphasized"> <span title="Example" class="eg">I couldn't catch what the <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%B9%81%E4%BD%93/announcer" title="announcer">announcer</a> said, with all the other <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%B9%81%E4%BD%93/noise" title="noise">noise</a> going on.</span>
- <span class="trans" lang="zh-Hant">
-
- 這麼吵，我聽不清播音員在說甚麼。</span>
+ </span></h3> <div class="sense-body">
+ <div class="def-block pad-indent" data-wl-senseid="ID_00004871_11"><p class="def-head semi-flush"><span class="def-info"><span class="freq">›</span> <span class="gram"><a href="https://dictionary.cambridge.org/zhs/help/codes.html">[<span class="gcs"> <span class="gc">T</span> </span>]</a></span></span> <b class="def">to <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%B9%81%E4%BD%93/manage" title="manage">manage</a> to <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%B9%81%E4%BD%93/hear" title="hear">hear</a> something</b></p><span class="def-body">
+ <span class="trans" lang="zh-Hant">聽見，聽到</span>
+ <div class="examp emphasized"> <span class="eg">I couldn't catch what the <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%B9%81%E4%BD%93/announcer" title="announcer">announcer</a> said, with all the other <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%B9%81%E4%BD%93/noise" title="noise">noise</a> going on.</span>
+ <span class="trans" lang="zh-Hant">這麼吵，我聽不清播音員在說甚麼。</span>
</div></span></div>
- </div>
+ </div> </div>
- </div>
-
- <div class="sense-block" id="english-chinese-traditional-1-1-9">
-
- <h3 class="txt-block txt-block--alt2"><span class="hw">catch</span> <span class="pos" title="A word that describes an action, condition or experience.">verb</span> <span class="guideword" title="Guide word: helps you find the right meaning when a word has more than one meaning">
+ <div class="sense-block" id="english-chinese-traditional-1-1-9"> <h3 class="txt-block txt-block--alt2"><span class="hw">catch</span> <span class="pos" title="A word that describes an action, condition or experience.">verb</span> <span class="guideword" title="Guide word: helps you find the right meaning when a word has more than one meaning">
(<span>HIT</span>)
- </span></h3>
- <div class="sense-body">
- <div class="def-block pad-indent" data-wl-senseid="ID_00004871_12"><p class="def-head semi-flush"><span class="def-info"><span class="freq">›</span> <span class="gram"><a href="https://dictionary.cambridge.org/zhs/help/codes.html">[<span class="gcs"> <span title="Transitive verb: a verb that has an object." class="gc">T</span> </span>]</a></span></span> <b class="def">to <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%B9%81%E4%BD%93/hit" title="hit">hit</a> something, <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%B9%81%E4%BD%93/especially" title="especially">especially</a> without <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%B9%81%E4%BD%93/intend" title="intending">intending</a> to</b></p><span class="def-body">
- <span class="trans" lang="zh-Hant">
-
- （尤指無意中）撞上，碰上</span>
- <div class="examp emphasized"> <span title="Example" class="eg">His <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%B9%81%E4%BD%93/head" title="head">head</a> caught the <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%B9%81%E4%BD%93/edge" title="edge">edge</a> of the <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%B9%81%E4%BD%93/table" title="table">table</a> as he <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%B9%81%E4%BD%93/fell" title="fell">fell</a>.</span>
- <span class="trans" lang="zh-Hant">
-
- 他摔倒的時候頭撞到了桌子邊。</span>
- </div><div class="examp emphasized"> <span title="Example" class="eg">Medical <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%B9%81%E4%BD%93/team" title="teams">teams</a> were caught <span class="b">in the <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%B9%81%E4%BD%93/crossfire" title="crossfire">crossfire</a></span> of the <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%B9%81%E4%BD%93/opposing" title="opposing">opposing</a> <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%B9%81%E4%BD%93/army" title="armies">armies</a>.</span>
- <span class="trans" lang="zh-Hant">
-
- 醫療隊陷入了敵軍的交叉火力中。</span>
+ </span></h3> <div class="sense-body">
+ <div class="def-block pad-indent" data-wl-senseid="ID_00004871_12"><p class="def-head semi-flush"><span class="def-info"><span class="freq">›</span> <span class="gram"><a href="https://dictionary.cambridge.org/zhs/help/codes.html">[<span class="gcs"> <span class="gc">T</span> </span>]</a></span></span> <b class="def">to <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%B9%81%E4%BD%93/hit" title="hit">hit</a> something, <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%B9%81%E4%BD%93/especially" title="especially">especially</a> without <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%B9%81%E4%BD%93/intend" title="intending">intending</a> to</b></p><span class="def-body">
+ <span class="trans" lang="zh-Hant">（尤指無意中）撞上，碰上</span>
+ <div class="examp emphasized"> <span class="eg">His <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%B9%81%E4%BD%93/head" title="head">head</a> caught the <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%B9%81%E4%BD%93/edge" title="edge">edge</a> of the <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%B9%81%E4%BD%93/table" title="table">table</a> as he <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%B9%81%E4%BD%93/fell" title="fell">fell</a>.</span>
+ <span class="trans" lang="zh-Hant">他摔倒的時候頭撞到了桌子邊。</span>
+ </div><div class="examp emphasized"> <span class="eg">Medical <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%B9%81%E4%BD%93/team" title="teams">teams</a> were caught <span class="b">in the <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%B9%81%E4%BD%93/crossfire" title="crossfire">crossfire</a></span> of the <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%B9%81%E4%BD%93/opposing" title="opposing">opposing</a> <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%B9%81%E4%BD%93/army" title="armies">armies</a>.</span>
+ <span class="trans" lang="zh-Hant">醫療隊陷入了敵軍的交叉火力中。</span>
</div></span></div>
- </div>
-
- </div>
-
- <div class="sense-block" id="english-chinese-traditional-1-1-10">
-
- <h3 class="txt-block txt-block--alt2"><span class="hw">catch</span> <span class="pos" title="A word that describes an action, condition or experience.">verb</span> <span class="guideword" title="Guide word: helps you find the right meaning when a word has more than one meaning">
- (<span>INVOLVE</span>)
- </span></h3>
- <div class="sense-body"><div class="phrase-block pad-indent"><span class="phrase-head"><span title="Phrase" class="phrase-title"><span class="phrase">get caught up in <span title="sth: abbreviation for something." class="obj">sth</span></span></span></span><div class="phrase-body pad-indent">
- <div class="def-block pad-indent" data-wl-senseid="ID_00004871_13"><p class="def-head semi-flush"><span class="def-info"><span class="epp-xref C2" title="C2: Proficiency level. English Vocabulary Profile symbols A1-C2 show which words and phrases learners know at each level.">C2</span> </span><b class="def">to <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%B9%81%E4%BD%93/become" title="become">become</a> <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%B9%81%E4%BD%93/involved" title="involved">involved</a> in something, often without <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%B9%81%E4%BD%93/wanting" title="wanting">wanting</a> to</b></p><span class="def-body">
- <span class="trans" lang="zh-Hant">
-
- （常指不情願地）被捲入，陷入</span>
- <div class="examp emphasized"> <span title="Example" class="eg">They were having an <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%B9%81%E4%BD%93/argument" title="argument">argument</a> and <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%B9%81%E4%BD%93/somehow" title="somehow">somehow</a> I got caught up in it.</span>
- <span class="trans" lang="zh-Hant">
-
- 他們在爭論，不知怎麼把我捲了進去。</span>
- </div></span></div>
- </div></div></div>
-
-
- <div id='ad_contentslot_2' class='am-default contentslot'>
+ </div>
+ <div id='ad_contentslot_3' class='am-default contentslot'>
<script type='text/javascript'>
- googletag.cmd.push(function() { googletag.display('ad_contentslot_2'); });
+ googletag.cmd.push(function() { googletag.display('ad_contentslot_3'); });
</script>
</div>
- </div>
+ </div>
- <div class="sense-block" id="english-chinese-traditional-1-1-11">
+ <div class="sense-block" id="english-chinese-traditional-1-1-10"> <h3 class="txt-block txt-block--alt2"><span class="hw">catch</span> <span class="pos" title="A word that describes an action, condition or experience.">verb</span> <span class="guideword" title="Guide word: helps you find the right meaning when a word has more than one meaning">
+ (<span>INVOLVE</span>)
+ </span></h3> <div class="sense-body"><div class="phrase-block pad-indent"><span class="phrase-head"><span class="phrase-title"><span class="phrase">get caught up in <span class="obj">sth</span></span></span></span><div class="phrase-body pad-indent">
+ <div class="def-block pad-indent" data-wl-senseid="ID_00004871_13"><p class="def-head semi-flush"><span class="def-info"><span class="epp-xref C2">C2</span> </span><b class="def">to <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%B9%81%E4%BD%93/become" title="become">become</a> <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%B9%81%E4%BD%93/involved" title="involved">involved</a> in something, often without <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%B9%81%E4%BD%93/wanting" title="wanting">wanting</a> to</b></p><span class="def-body">
+ <span class="trans" lang="zh-Hant">（常指不情願地）被捲入，陷入</span>
+ <div class="examp emphasized"> <span class="eg">They were having an <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%B9%81%E4%BD%93/argument" title="argument">argument</a> and <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%B9%81%E4%BD%93/somehow" title="somehow">somehow</a> I got caught up in it.</span>
+ <span class="trans" lang="zh-Hant">他們在爭論，不知怎麼把我捲了進去。</span>
+ </div></span></div>
+ </div></div></div> </div>
- <h3 class="txt-block txt-block--alt2"><span class="hw">catch</span> <span class="pos" title="A word that describes an action, condition or experience.">verb</span> <span class="guideword" title="Guide word: helps you find the right meaning when a word has more than one meaning">
+ <div class="sense-block" id="english-chinese-traditional-1-1-11"> <h3 class="txt-block txt-block--alt2"><span class="hw">catch</span> <span class="pos" title="A word that describes an action, condition or experience.">verb</span> <span class="guideword" title="Guide word: helps you find the right meaning when a word has more than one meaning">
(<span>BREATHE</span>)
- </span></h3>
- <div class="sense-body"><div class="phrase-block pad-indent"><span class="phrase-head"><span title="Phrase" class="phrase-title"><span class="phrase">catch <span title="You can use my, your, their, etc. here" class="obj">your</span> breath</span></span></span><div class="phrase-body pad-indent">
+ </span></h3> <div class="sense-body"><div class="phrase-block pad-indent"><span class="phrase-head"><span class="phrase-title"><span class="phrase">catch <span class="obj">your</span> breath</span></span></span><div class="phrase-body pad-indent">
<div class="def-block pad-indent" data-wl-senseid="ID_00004871_14"><p class="def-head semi-flush"><span class="def-info"><span class="freq">›</span> </span><b class="def">to <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%B9%81%E4%BD%93/stop" title="stop">stop</a> <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%B9%81%E4%BD%93/breathing" title="breathing">breathing</a> for a <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%B9%81%E4%BD%93/moment" title="moment">moment</a>, or to <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%B9%81%E4%BD%93/begin" title="begin">begin</a> to <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%B9%81%E4%BD%93/breathe" title="breathe">breathe</a> correctly again after <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%B9%81%E4%BD%93/running" title="running">running</a> or other <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%B9%81%E4%BD%93/exercise" title="exercise">exercise</a></b></p><span class="def-body">
- <span class="trans" lang="zh-Hant">
-
- 屏住呼吸；（跑步或運動後）調整呼吸</span>
- <div class="examp emphasized"> <span title="Example" class="eg">I had to <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%B9%81%E4%BD%93/sit" title="sit">sit</a> down and catch my <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%B9%81%E4%BD%93/breath" title="breath">breath</a>.</span>
- <span class="trans" lang="zh-Hant">
-
- 我只好坐下喘口氣。</span>
+ <span class="trans" lang="zh-Hant">屏住呼吸；（跑步或運動後）調整呼吸</span>
+ <div class="examp emphasized"> <span class="eg">I had to <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%B9%81%E4%BD%93/sit" title="sit">sit</a> down and catch my <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%B9%81%E4%BD%93/breath" title="breath">breath</a>.</span>
+ <span class="trans" lang="zh-Hant">我只好坐下喘口氣。</span>
</div></span></div>
- </div></div></div>
-
- </div>
-
- <div class="sense-block" id="english-chinese-traditional-1-1-12">
+ </div></div></div> </div>
- <h3 class="txt-block txt-block--alt2"><span class="hw">catch</span> <span class="pos" title="A word that describes an action, condition or experience.">verb</span> <span class="guideword" title="Guide word: helps you find the right meaning when a word has more than one meaning">
+ <div class="sense-block" id="english-chinese-traditional-1-1-12"> <h3 class="txt-block txt-block--alt2"><span class="hw">catch</span> <span class="pos" title="A word that describes an action, condition or experience.">verb</span> <span class="guideword" title="Guide word: helps you find the right meaning when a word has more than one meaning">
(<span>BE TOUCHED BY</span>)
- </span></h3>
- <div class="sense-body"><div class="phrase-block pad-indent"><span class="phrase-head"><span title="Phrase" class="phrase-title"><span class="phrase">catch the sun</span></span> <span class="phrase-info"><span title="British English" class="lab"><span title="British English" class="region">UK</span></span></span></span><div class="phrase-body pad-indent">
+ </span></h3> <div class="sense-body"><div class="phrase-block pad-indent"><span class="phrase-head"><span class="phrase-title"><span class="phrase">catch the sun</span></span> <span class="phrase-info"><span class="lab"><span class="region">UK</span></span></span></span><div class="phrase-body pad-indent">
<div class="def-block pad-indent" data-wl-senseid="ID_00004871_15"><p class="def-head semi-flush"><span class="def-info"><span class="freq">›</span> </span><b class="def">If you have caught the <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%B9%81%E4%BD%93/sun" title="sun">sun</a>, the <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%B9%81%E4%BD%93/sun" title="sun">sun</a> has made <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%B9%81%E4%BD%93/your" title="your">your</a> <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%B9%81%E4%BD%93/skin" title="skin">skin</a> a <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%B9%81%E4%BD%93/slightly" title="slightly">slightly</a> <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%B9%81%E4%BD%93/dark" title="darker">darker</a> <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%B9%81%E4%BD%93/brown" title="brown">brown</a> or <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%B9%81%E4%BD%93/red" title="red">red</a> <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%B9%81%E4%BD%93/colour" title="colour">colour</a>.</b></p><span class="def-body">
- <span class="trans" lang="zh-Hant">
-
- （皮膚）被曬黑</span>
- <div class="examp emphasized"> <span title="Example" class="eg">You've caught the <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%B9%81%E4%BD%93/sun" title="sun">sun</a> on the back of <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%B9%81%E4%BD%93/your" title="your">your</a> <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%B9%81%E4%BD%93/neck" title="neck">neck</a>.</span>
- <span class="trans" lang="zh-Hant">
-
- 你脖子後面曬黑了。</span>
+ <span class="trans" lang="zh-Hant">（皮膚）被曬黑</span>
+ <div class="examp emphasized"> <span class="eg">You've caught the <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%B9%81%E4%BD%93/sun" title="sun">sun</a> on the back of <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%B9%81%E4%BD%93/your" title="your">your</a> <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%B9%81%E4%BD%93/neck" title="neck">neck</a>.</span>
+ <span class="trans" lang="zh-Hant">你脖子後面曬黑了。</span>
</div></span></div>
- </div></div><div class="phrase-block pad-indent"><span class="phrase-head"><span title="Phrase" class="phrase-title"><span class="phrase">catch the light</span></span></span><div class="phrase-body pad-indent">
+ </div></div><div class="phrase-block pad-indent"><span class="phrase-head"><span class="phrase-title"><span class="phrase">catch the light</span></span></span><div class="phrase-body pad-indent">
<div class="def-block pad-indent" data-wl-senseid="ID_00004871_17"><p class="def-head semi-flush"><span class="def-info"><span class="freq">›</span> </span><b class="def">If something catches the <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%B9%81%E4%BD%93/light" title="light">light</a>, a <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%B9%81%E4%BD%93/light" title="light">light</a> <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%B9%81%E4%BD%93/shine" title="shines">shines</a> on it and makes it <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%B9%81%E4%BD%93/look" title="look">look</a> <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%B9%81%E4%BD%93/shiny" title="shiny">shiny</a>.</b></p><span class="def-body">
- <span class="trans" lang="zh-Hant">
-
- 被光照射；在光照下閃閃發亮</span>
+ <span class="trans" lang="zh-Hant">被光照射；在光照下閃閃發亮</span>
</span></div>
- </div></div></div>
-
- </div>
-
- <div class="sense-block" id="english-chinese-traditional-1-1-13">
+ </div></div></div>
+ <div id='ad_contentslot_4' class='am-default contentslot'>
+ <script type='text/javascript'>
+ googletag.cmd.push(function() { googletag.display('ad_contentslot_4'); });
+ </script>
+ </div>
+ </div>
- <h3 class="txt-block txt-block--alt2"><span class="hw">catch</span> <span class="pos" title="A word that describes an action, condition or experience.">verb</span> <span class="guideword" title="Guide word: helps you find the right meaning when a word has more than one meaning">
+ <div class="sense-block" id="english-chinese-traditional-1-1-13"> <h3 class="txt-block txt-block--alt2"><span class="hw">catch</span> <span class="pos" title="A word that describes an action, condition or experience.">verb</span> <span class="guideword" title="Guide word: helps you find the right meaning when a word has more than one meaning">
(<span>BURN</span>)
- </span></h3>
- <div class="sense-body"><div class="phrase-block pad-indent"><span class="phrase-head"><span title="Phrase" class="phrase-title"><span class="phrase">catch fire</span></span></span><div class="phrase-body pad-indent">
- <div class="def-block pad-indent" data-wl-senseid="ID_00004871_18"><p class="def-head semi-flush"><span class="def-info"><span class="epp-xref B1" title="B1: Intermediate level. English Vocabulary Profile symbols A1-C2 show which words and phrases learners know at each level.">B1</span> </span><b class="def">to <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%B9%81%E4%BD%93/start" title="start">start</a> <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%B9%81%E4%BD%93/burning" title="burning">burning</a></b></p><span class="def-body">
- <span class="trans" lang="zh-Hant">
-
- 著火；失火</span>
- <div class="examp emphasized"> <span title="Example" class="eg">For <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%B9%81%E4%BD%93/reason" title="reasons">reasons</a> which are not <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%B9%81%E4%BD%93/yet" title="yet">yet</a> <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%B9%81%E4%BD%93/known" title="known">known</a>, the <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%B9%81%E4%BD%93/factory" title="factory">factory</a> caught <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%B9%81%E4%BD%93/fire" title="fire">fire</a> late <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%B9%81%E4%BD%93/yesterday" title="yesterday">yesterday</a> <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%B9%81%E4%BD%93/evening" title="evening">evening</a>.</span>
- <span class="trans" lang="zh-Hant">
-
- 昨晚工廠失火，原因尚不清楚。</span>
+ </span></h3> <div class="sense-body"><div class="phrase-block pad-indent"><span class="phrase-head"><span class="phrase-title"><span class="phrase">catch fire</span></span></span><div class="phrase-body pad-indent">
+ <div class="def-block pad-indent" data-wl-senseid="ID_00004871_18"><p class="def-head semi-flush"><span class="def-info"><span class="epp-xref B1">B1</span> </span><b class="def">to <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%B9%81%E4%BD%93/start" title="start">start</a> <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%B9%81%E4%BD%93/burning" title="burning">burning</a></b></p><span class="def-body">
+ <span class="trans" lang="zh-Hant">著火；失火</span>
+ <div class="examp emphasized"> <span class="eg">For <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%B9%81%E4%BD%93/reason" title="reasons">reasons</a> which are not <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%B9%81%E4%BD%93/yet" title="yet">yet</a> <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%B9%81%E4%BD%93/known" title="known">known</a>, the <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%B9%81%E4%BD%93/factory" title="factory">factory</a> caught <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%B9%81%E4%BD%93/fire" title="fire">fire</a> late <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%B9%81%E4%BD%93/yesterday" title="yesterday">yesterday</a> <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%B9%81%E4%BD%93/evening" title="evening">evening</a>.</span>
+ <span class="trans" lang="zh-Hant">昨晚工廠失火，原因尚不清楚。</span>
</div></span></div>
- </div></div>
- <div class="def-block pad-indent" data-wl-senseid="ID_00004871_19"><p class="def-head semi-flush"><span class="def-info"><span class="freq">›</span> <span class="gram"><a href="https://dictionary.cambridge.org/zhs/help/codes.html">[<span class="gcs"> <span title="Intransitive verb: a verb that has no object." class="gc">I</span> </span>]</a></span></span> <b class="def">to <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%B9%81%E4%BD%93/begin" title="begin">begin</a> to <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%B9%81%E4%BD%93/burn" title="burn">burn</a></b></p><span class="def-body">
- <span class="trans" lang="zh-Hant">
-
- 開始燃燒；著火</span>
- <div class="examp emphasized"> <span title="Example" class="eg">This wood's too <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%B9%81%E4%BD%93/wet" title="wet">wet</a>, the <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%B9%81%E4%BD%93/fire" title="fire">fire</a> won't catch.</span>
- <span class="trans" lang="zh-Hant">
-
- 木頭太濕，點不著。</span>
+ </div></div>
+ <div class="def-block pad-indent" data-wl-senseid="ID_00004871_19"><p class="def-head semi-flush"><span class="def-info"><span class="freq">›</span> <span class="gram"><a href="https://dictionary.cambridge.org/zhs/help/codes.html">[<span class="gcs"> <span class="gc">I</span> </span>]</a></span></span> <b class="def">to <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%B9%81%E4%BD%93/begin" title="begin">begin</a> to <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%B9%81%E4%BD%93/burn" title="burn">burn</a></b></p><span class="def-body">
+ <span class="trans" lang="zh-Hant">開始燃燒；著火</span>
+ <div class="examp emphasized"> <span class="eg">This wood's too <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%B9%81%E4%BD%93/wet" title="wet">wet</a>, the <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%B9%81%E4%BD%93/fire" title="fire">fire</a> won't catch.</span>
+ <span class="trans" lang="zh-Hant">木頭太濕，點不著。</span>
</div></span></div>
- </div>
-
- </div><div class="cols cols--half"><div class="cols__col"><div class="xref idioms">
- <h3 class="h4 txt-block txt-block--alt"><strong class="xref-title">
+ </div> </div><div class="cols cols--half"><div class="cols__col"><div class="xref idioms"><h3 class="h4 txt-block txt-block--alt"><strong class="xref-title">
习惯用语 </strong></h3>
-
<div class="item"><a href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%B9%81%E4%BD%93/catch-sb-s-eye" title="catch sb's eye的意思"><span class="x-h"><span class="phrase">catch <span class="obj">sb's</span> eye</span></span></a></div>
- <div class="item"><a href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%B9%81%E4%BD%93/catch-sb-napping" title="catch sb napping的意思"><span class="x-h"><span class="phrase">catch <span title="sb: abbreviation for somebody." class="obj">sb</span> napping</span></span></a></div>
+ <div class="item"><a href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%B9%81%E4%BD%93/catch-sb-napping" title="catch sb napping的意思"><span class="x-h"><span class="phrase">catch <span class="obj">sb</span> napping</span></span></a></div>
- <div class="item"><a href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%B9%81%E4%BD%93/catch-sb-red-handed" title="catch sb red-handed的意思"><span class="x-h"><span class="phrase">catch <span title="sb: abbreviation for somebody." class="obj">sb</span> red-handed</span></span></a></div>
+ <div class="item"><a href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%B9%81%E4%BD%93/catch-sb-red-handed" title="catch sb red-handed的意思"><span class="x-h"><span class="phrase">catch <span class="obj">sb</span> red-handed</span></span></a></div>
- <div class="item"><a href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%B9%81%E4%BD%93/catch-sb-with-their-pants-trousers-down" title="catch sb with their pants/trousers down的意思"><span class="x-h"><span class="phrase">catch <span title="sb: abbreviation for somebody." class="obj">sb</span> with <span class="obj">their</span> pants/trousers down</span></span></a></div></div></div><div class="cols__col"><div class="xref phrasal_verbs">
- <h3 class="h4 txt-block txt-block--alt"><strong class="xref-title">
+ <div class="item"><a href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%B9%81%E4%BD%93/catch-sb-with-their-pants-trousers-down" title="catch sb with their pants/trousers down的意思"><span class="x-h"><span class="phrase">catch <span class="obj">sb</span> with <span class="obj">their</span> pants/trousers down</span></span></a></div></div></div><div class="cols__col"><div class="xref phrasal_verbs"><h3 class="h4 txt-block txt-block--alt"><strong class="xref-title">
动词短语 </strong></h3>
-
<div class="item"><a href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%B9%81%E4%BD%93/catch-on" title="catch on的意思"><span class="x-h"><span class="phrase">catch on</span></span></a></div>
- <div class="item"><a href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%B9%81%E4%BD%93/catch-sb-out" title="catch sb out的意思"><span class="x-h"><span class="phrase">catch <span title="sb: abbreviation for somebody." class="obj">sb</span> out</span></span></a></div>
+ <div class="item"><a href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%B9%81%E4%BD%93/catch-sb-out" title="catch sb out的意思"><span class="x-h"><span class="phrase">catch <span class="obj">sb</span> out</span></span></a></div>
- <div class="item"><a href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%B9%81%E4%BD%93/catch-sb-up" title="catch (sb) up的意思"><span class="x-h"><span class="phrase">catch <span title="sb: abbreviation for somebody." class="obj">(sb)</span> up</span></span></a></div>
+ <div class="item"><a href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%B9%81%E4%BD%93/catch-sb-up" title="catch (sb) up的意思"><span class="x-h"><span class="phrase">catch <span class="obj">(sb)</span> up</span></span></a></div>
<div class="item"><a href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%B9%81%E4%BD%93/catch-up" title="catch up的意思"><span class="x-h"><span class="phrase">catch up</span></span></a></div>
- <div class="item"><a href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%B9%81%E4%BD%93/catch-sb-up-on-sth" title="catch sb up on sth的意思"><span class="x-h"><span class="phrase">catch <span title="sb: abbreviation for somebody." class="obj">sb</span> up on <span title="sth: abbreviation for something." class="obj">sth</span></span></span></a></div>
+ <div class="item"><a href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%B9%81%E4%BD%93/catch-sb-up-on-sth" title="catch sb up on sth的意思"><span class="x-h"><span class="phrase">catch <span class="obj">sb</span> up on <span class="obj">sth</span></span></span></a></div>
- <div class="item"><a href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%B9%81%E4%BD%93/catch-up-with-sb" title="catch up with sb的意思"><span class="x-h"><span class="phrase">catch up with <span title="sb: abbreviation for somebody." class="obj">sb</span></span></span></a></div></div></div></div></div></div> <div class="entry-body__el clrd js-share-holder"><div class="pos-header">
- <div class="h3 di-title cdo-section-title-hw"><span class="headword"><span class="hw">catch</span></span>
+ <div class="item"><a href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%B9%81%E4%BD%93/catch-up-with-sb" title="catch up with sb的意思"><span class="x-h"><span class="phrase">catch up with <span class="obj">sb</span></span></span></a></div></div></div></div></div></div> <div class="entry-body__el clrd js-share-holder"><div class="pos-header"><div class="h3 di-title cdo-section-title-hw"><span class="headword"><span class="hw">catch</span></span>
<span class="posgram ico-bg"><span class="pos" title="A word that refers to a person, place, idea, event or thing.">noun</span></span>
</div>
- <span class="pron-info"><span class="uk"><span class="region">uk</span>
- <span title="catch: listen to British English pronunciation" data-src-mp3="https://dictionary.cambridge.org/zhs/media/english-chinese-traditional/uk_pron/u/ukc/ukcas/ukcaste029.mp3" data-src-ogg="https://dictionary.cambridge.org/zhs/media/english-chinese-traditional/uk_pron_ogg/u/ukc/ukcas/ukcaste029.ogg" class="circle circle-btn sound audio_play_button uk">
+ <span class="uk"><span class="region">uk</span>
+ <span title="catch: listen to British English pronunciation" data-src-mp3="/zhs/media/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%B9%81%E4%BD%93/uk_pron/u/ukc/ukcas/ukcaste029.mp3" data-src-ogg="/zhs/media/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%B9%81%E4%BD%93/uk_pron_ogg/u/ukc/ukcas/ukcaste029.ogg" class="circle circle-btn sound audio_play_button">
<i class='fcdo fcdo-volume-up'>​</i>
</span>
- </span>
- <span class="uk"><span class="pron">/<span class="ipa">kætʃ</span>/</span></span>
- </span><span class="pron-info"><span class="us"><span class="region">us</span>
- <span title="catch: listen to American pronunciation" data-src-mp3="https://dictionary.cambridge.org/zhs/media/english-chinese-traditional/us_pron/c/cat/catch/catch.mp3" data-src-ogg="https://dictionary.cambridge.org/zhs/media/english-chinese-traditional/us_pron_ogg/c/cat/catch/catch.ogg" class="circle circle-btn sound audio_play_button us">
+ <span class="pron">/<span class="ipa">kætʃ</span>/</span> </span><span class="us"><span class="region">us</span>
+ <span title="catch: listen to American pronunciation" data-src-mp3="/zhs/media/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%B9%81%E4%BD%93/us_pron/c/cat/catch/catch.mp3" data-src-ogg="/zhs/media/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%B9%81%E4%BD%93/us_pron_ogg/c/cat/catch/catch.ogg" class="circle circle-btn sound audio_play_button">
<i class='fcdo fcdo-volume-up'>​</i>
</span>
- </span>
- <span class="uk"><span class="pron">/<span class="ipa">kætʃ</span>/</span></span>
- </span>
+ <span class="pron">/<span class="ipa">kætʃ</span>/</span> </span>
<div class="share rounded js-share">
<span class="point"></span>
@@ -1355,9 +1393,6 @@ <h3 class="h4 txt-block txt-block--alt"><strong class="xref-title">
</a>
<a class="circle bg--di socialShareLink" title="在Diigo上分享该词条" href='https://www.diigo.com/post?url=https%3A%2F%2Fdictionary.cambridge.org%2Fzhs%2F%25E8%25AF%258D%25E5%2585%25B8%2F%25E8%258B%25B1%25E8%25AF%25AD-%25E6%25B1%2589%25E8%25AF%25AD-%25E7%25B9%2581%25E4%25BD%2593%2Fcatch&title=catch%E6%B1%89%E8%AF%AD%28%E7%B9%81%E4%BD%93%29%E7%BF%BB%E8%AF%91%EF%BC%9A%E5%89%91%E6%A1%A5%E8%AF%8D%E5%85%B8' target='_blank' data-social='diigo' data-url='https://www.diigo.com/post?url=https%3A%2F%2Fdictionary.cambridge.org%2Fzhs%2F%25E8%25AF%258D%25E5%2585%25B8%2F%25E8%258B%25B1%25E8%25AF%25AD-%25E6%25B1%2589%25E8%25AF%25AD-%25E7%25B9%2581%25E4%25BD%2593%2Fcatch&title=catch%E6%B1%89%E8%AF%AD%28%E7%B9%81%E4%BD%93%29%E7%BF%BB%E8%AF%91%EF%BC%9A%E5%89%91%E6%A1%A5%E8%AF%8D%E5%85%B8' data-object='entry'>
<i class="fcdo fcdo-diigo" aria-hidden="true"></i>
- </a>
- <a class="circle bg--su socialShareLink" title="在StumbleUpon上分享该词条" href='https://www.stumbleupon.com/likecontent?url=https%3A%2F%2Fdictionary.cambridge.org%2Fzhs%2F%25E8%25AF%258D%25E5%2585%25B8%2F%25E8%258B%25B1%25E8%25AF%25AD-%25E6%25B1%2589%25E8%25AF%25AD-%25E7%25B9%2581%25E4%25BD%2593%2Fcatch&title=catch%E6%B1%89%E8%AF%AD%28%E7%B9%81%E4%BD%93%29%E7%BF%BB%E8%AF%91%EF%BC%9A%E5%89%91%E6%A1%A5%E8%AF%8D%E5%85%B8' target='_blank' data-social='stumbleupon' data-url='https://www.stumbleupon.com/likecontent?url=https%3A%2F%2Fdictionary.cambridge.org%2Fzhs%2F%25E8%25AF%258D%25E5%2585%25B8%2F%25E8%258B%25B1%25E8%25AF%25AD-%25E6%25B1%2589%25E8%25AF%25AD-%25E7%25B9%2581%25E4%25BD%2593%2Fcatch&title=catch%E6%B1%89%E8%AF%AD%28%E7%B9%81%E4%BD%93%29%E7%BF%BB%E8%AF%91%EF%BC%9A%E5%89%91%E6%A1%A5%E8%AF%8D%E5%85%B8' data-object='entry'>
- <i class="fcdo fcdo-stumbleupon" aria-hidden="true"></i>
</a>
<a class="circle bg--tu socialShareLink" title="在Tumblr上分享该词条" href='https://www.tumblr.com/share/link?url=https%3A%2F%2Fdictionary.cambridge.org%2Fzhs%2F%25E8%25AF%258D%25E5%2585%25B8%2F%25E8%258B%25B1%25E8%25AF%25AD-%25E6%25B1%2589%25E8%25AF%25AD-%25E7%25B9%2581%25E4%25BD%2593%2Fcatch&name=catch%E6%B1%89%E8%AF%AD%28%E7%B9%81%E4%BD%93%29%E7%BF%BB%E8%AF%91%EF%BC%9A%E5%89%91%E6%A1%A5%E8%AF%8D%E5%85%B8' target='_blank' data-social='tumblr' data-url='https://www.tumblr.com/share/link?url=https%3A%2F%2Fdictionary.cambridge.org%2Fzhs%2F%25E8%25AF%258D%25E5%2585%25B8%2F%25E8%258B%25B1%25E8%25AF%25AD-%25E6%25B1%2589%25E8%25AF%25AD-%25E7%25B9%2581%25E4%25BD%2593%2Fcatch&name=catch%E6%B1%89%E8%AF%AD%28%E7%B9%81%E4%BD%93%29%E7%BF%BB%E8%AF%91%EF%BC%9A%E5%89%91%E6%A1%A5%E8%AF%8D%E5%85%B8' data-object='entry'>
<i class="fcdo fcdo-tumblr" aria-hidden="true"></i>
@@ -1372,99 +1407,59 @@ <h3 class="h4 txt-block txt-block--alt"><strong class="xref-title">
</div>
</div><div class="pos-body">
- <div class="sense-block" id="english-chinese-traditional-1-2-1">
-
- <h3 class="txt-block txt-block--alt2"><span class="hw">catch</span> <span class="pos" title="A word that refers to a person, place, idea, event or thing.">noun</span> <span class="guideword" title="Guide word: helps you find the right meaning when a word has more than one meaning">
+ <div class="sense-block" id="english-chinese-traditional-1-2-1"> <h3 class="txt-block txt-block--alt2"><span class="hw">catch</span> <span class="pos" title="A word that refers to a person, place, idea, event or thing.">noun</span> <span class="guideword" title="Guide word: helps you find the right meaning when a word has more than one meaning">
(<span>PROBLEM</span>)
- </span></h3>
- <div class="sense-body">
- <div class="def-block pad-indent" data-wl-senseid="ID_00004871_38"><p class="def-head semi-flush"><span class="def-info"><span class="freq">›</span> <span class="gram"><a href="https://dictionary.cambridge.org/zhs/help/codes.html">[<span class="gcs"> <span title="Singular noun: a noun only used in singular form and which has no plural form." class="gc">S</span> </span>]</a></span></span> <b class="def">a <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%B9%81%E4%BD%93/hidden" title="hidden">hidden</a> <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%B9%81%E4%BD%93/problem" title="problem">problem</a> or <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%B9%81%E4%BD%93/disadvantage" title="disadvantage">disadvantage</a></b></p><span class="def-body">
- <span class="trans" lang="zh-Hant">
-
- 隱藏的問題；暗藏的不利因素</span>
- <div class="examp emphasized"> <span title="Example" class="eg">Free <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%B9%81%E4%BD%93/food" title="food">food</a>? It <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%B9%81%E4%BD%93/sound" title="sounds">sounds</a> too good to be <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%B9%81%E4%BD%93/true" title="true">true</a>. <span class="b">What's the</span> catch?</span>
- <span class="trans" lang="zh-Hant">
-
- 免費食物？這麼好的事，不像是真的。這裡面有甚麼蹊蹺？</span>
+ </span></h3> <div class="sense-body">
+ <div class="def-block pad-indent" data-wl-senseid="ID_00004871_38"><p class="def-head semi-flush"><span class="def-info"><span class="freq">›</span> <span class="gram"><a href="https://dictionary.cambridge.org/zhs/help/codes.html">[<span class="gcs"> <span class="gc">S</span> </span>]</a></span></span> <b class="def">a <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%B9%81%E4%BD%93/hidden" title="hidden">hidden</a> <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%B9%81%E4%BD%93/problem" title="problem">problem</a> or <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%B9%81%E4%BD%93/disadvantage" title="disadvantage">disadvantage</a></b></p><span class="def-body">
+ <span class="trans" lang="zh-Hant">隱藏的問題；暗藏的不利因素</span>
+ <div class="examp emphasized"> <span class="eg">Free <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%B9%81%E4%BD%93/food" title="food">food</a>? It <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%B9%81%E4%BD%93/sound" title="sounds">sounds</a> too good to be <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%B9%81%E4%BD%93/true" title="true">true</a>. <span class="b">What's the</span> catch?</span>
+ <span class="trans" lang="zh-Hant">免費食物？這麼好的事，不像是真的。這裡面有甚麼蹊蹺？</span>
</div></span></div>
- </div>
-
- </div>
-
- <div class="sense-block" id="english-chinese-traditional-1-2-2">
+ </div> </div>
- <h3 class="txt-block txt-block--alt2"><span class="hw">catch</span> <span class="pos" title="A word that refers to a person, place, idea, event or thing.">noun</span> <span class="guideword" title="Guide word: helps you find the right meaning when a word has more than one meaning">
+ <div class="sense-block" id="english-chinese-traditional-1-2-2"> <h3 class="txt-block txt-block--alt2"><span class="hw">catch</span> <span class="pos" title="A word that refers to a person, place, idea, event or thing.">noun</span> <span class="guideword" title="Guide word: helps you find the right meaning when a word has more than one meaning">
(<span>SOMETHING CAUGHT</span>)
- </span></h3>
- <div class="sense-body">
- <div class="def-block pad-indent" data-wl-senseid="ID_00004871_39"><p class="def-head semi-flush"><span class="def-info"><span class="freq">›</span> <span class="gram"><a href="https://dictionary.cambridge.org/zhs/help/codes.html">[<span class="gcs"> <span title="Countable noun: a noun that has both singular and plural forms." class="gc">C</span> </span>]</a></span></span> <b class="def">an <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%B9%81%E4%BD%93/amount" title="amount">amount</a> of <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%B9%81%E4%BD%93/fish" title="fish">fish</a> caught</b></p><span class="def-body">
- <span class="trans" lang="zh-Hant">
-
- （魚的）捕獲量</span>
- <div class="examp emphasized"> <span title="Example" class="eg">The <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%B9%81%E4%BD%93/fisherman" title="fishermen">fishermen</a> were <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%B9%81%E4%BD%93/disappointed" title="disappointed">disappointed</a> with <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%B9%81%E4%BD%93/their" title="their">their</a> catch that <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%B9%81%E4%BD%93/day" title="day">day</a>.</span>
- <span class="trans" lang="zh-Hant">
-
- 漁夫們不滿意當天的收穫。</span>
+ </span></h3> <div class="sense-body">
+ <div class="def-block pad-indent" data-wl-senseid="ID_00004871_39"><p class="def-head semi-flush"><span class="def-info"><span class="freq">›</span> <span class="gram"><a href="https://dictionary.cambridge.org/zhs/help/codes.html">[<span class="gcs"> <span class="gc">C</span> </span>]</a></span></span> <b class="def">an <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%B9%81%E4%BD%93/amount" title="amount">amount</a> of <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%B9%81%E4%BD%93/fish" title="fish">fish</a> caught</b></p><span class="def-body">
+ <span class="trans" lang="zh-Hant">（魚的）捕獲量</span>
+ <div class="examp emphasized"> <span class="eg">The <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%B9%81%E4%BD%93/fisherman" title="fishermen">fishermen</a> were <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%B9%81%E4%BD%93/disappointed" title="disappointed">disappointed</a> with <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%B9%81%E4%BD%93/their" title="their">their</a> catch that <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%B9%81%E4%BD%93/day" title="day">day</a>.</span>
+ <span class="trans" lang="zh-Hant">漁夫們不滿意當天的收穫。</span>
</div></span></div>
- <div class="def-block pad-indent" data-wl-senseid="ID_00004871_40"><p class="def-head semi-flush"><span class="def-info"><span class="freq">›</span> <span class="gram"><a href="https://dictionary.cambridge.org/zhs/help/codes.html">[<span class="gcs"> <span title="Singular noun: a noun only used in singular form and which has no plural form." class="gc">S</span> </span>]</a></span> <span title="Used in relaxed situations, for example with friends and family. Used more in speech." class="lab"><span title="Used in relaxed situations, for example with friends and family. Used more in speech." class="usage">informal</span></span></span> <b class="def">a <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%B9%81%E4%BD%93/person" title="person">person</a> who is <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%B9%81%E4%BD%93/considered" title="considered">considered</a> to be very <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%B9%81%E4%BD%93/suitable" title="suitable">suitable</a> for a <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%B9%81%E4%BD%93/relationship" title="relationship">relationship</a></b></p><span class="def-body">
- <span class="trans" lang="zh-Hant">
-
- 般配的人；合適的對象</span>
- <div class="examp emphasized"> <span title="Example" class="eg">Her new boyfriend's not much of a catch really, is he?</span>
- <span class="trans" lang="zh-Hant">
-
- 她的新男朋友和她不太般配，是吧？</span>
+ <div class="def-block pad-indent" data-wl-senseid="ID_00004871_40"><p class="def-head semi-flush"><span class="def-info"><span class="freq">›</span> <span class="gram"><a href="https://dictionary.cambridge.org/zhs/help/codes.html">[<span class="gcs"> <span class="gc">S</span> </span>]</a></span> <span class="lab"><span class="usage">informal</span></span></span> <b class="def">a <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%B9%81%E4%BD%93/person" title="person">person</a> who is <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%B9%81%E4%BD%93/considered" title="considered">considered</a> to be very <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%B9%81%E4%BD%93/suitable" title="suitable">suitable</a> for a <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%B9%81%E4%BD%93/relationship" title="relationship">relationship</a></b></p><span class="def-body">
+ <span class="trans" lang="zh-Hant">般配的人；合適的對象</span>
+ <div class="examp emphasized"> <span class="eg">Her new boyfriend's not much of a catch really, is he?</span>
+ <span class="trans" lang="zh-Hant">她的新男朋友和她不太般配，是吧？</span>
</div></span></div>
- </div>
-
-
- <div id='ad_contentslot_3' class='am-default contentslot'>
+ </div>
+ <div id='ad_contentslot_5' class='am-default contentslot'>
<script type='text/javascript'>
- googletag.cmd.push(function() { googletag.display('ad_contentslot_3'); });
+ googletag.cmd.push(function() { googletag.display('ad_contentslot_5'); });
</script>
</div>
- </div>
-
- <div class="sense-block" id="english-chinese-traditional-1-2-3">
+ </div>
- <h3 class="txt-block txt-block--alt2"><span class="hw">catch</span> <span class="pos" title="A word that refers to a person, place, idea, event or thing.">noun</span> <span class="guideword" title="Guide word: helps you find the right meaning when a word has more than one meaning">
+ <div class="sense-block" id="english-chinese-traditional-1-2-3"> <h3 class="txt-block txt-block--alt2"><span class="hw">catch</span> <span class="pos" title="A word that refers to a person, place, idea, event or thing.">noun</span> <span class="guideword" title="Guide word: helps you find the right meaning when a word has more than one meaning">
(<span>FASTENING DEVICE</span>)
- </span></h3>
- <div class="sense-body">
- <div class="def-block pad-indent" data-wl-senseid="ID_00004871_41"><p class="def-head semi-flush"><span class="def-info"><span class="freq">›</span> <span class="gram"><a href="https://dictionary.cambridge.org/zhs/help/codes.html">[<span class="gcs"> <span title="Countable noun: a noun that has both singular and plural forms." class="gc">C</span> </span>]</a></span></span> <b class="def">a <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%B9%81%E4%BD%93/small" title="small">small</a> <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%B9%81%E4%BD%93/device" title="device">device</a> on a <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%B9%81%E4%BD%93/door" title="door">door</a>, <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%B9%81%E4%BD%93/window" title="window">window</a>, <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%B9%81%E4%BD%93/bag" title="bag">bag</a>, etc. that <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%B9%81%E4%BD%93/keeps" title="keeps">keeps</a> it <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%B9%81%E4%BD%93/fasten" title="fastened">fastened</a></b></p><span class="def-body">
- <span class="trans" lang="zh-Hant">
-
- （門、窗、包等的）栓，扣，鉤</span>
+ </span></h3> <div class="sense-body">
+ <div class="def-block pad-indent" data-wl-senseid="ID_00004871_41"><p class="def-head semi-flush"><span class="def-info"><span class="freq">›</span> <span class="gram"><a href="https://dictionary.cambridge.org/zhs/help/codes.html">[<span class="gcs"> <span class="gc">C</span> </span>]</a></span></span> <b class="def">a <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%B9%81%E4%BD%93/small" title="small">small</a> <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%B9%81%E4%BD%93/device" title="device">device</a> on a <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%B9%81%E4%BD%93/door" title="door">door</a>, <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%B9%81%E4%BD%93/window" title="window">window</a>, <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%B9%81%E4%BD%93/bag" title="bag">bag</a>, etc. that <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%B9%81%E4%BD%93/keeps" title="keeps">keeps</a> it <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%B9%81%E4%BD%93/fasten" title="fastened">fastened</a></b></p><span class="def-body">
+ <span class="trans" lang="zh-Hant">（門、窗、包等的）栓，扣，鉤</span>
</span></div>
- </div>
+ </div> </div>
- </div>
-
- <div class="sense-block" id="english-chinese-traditional-1-2-4">
-
- <h3 class="txt-block txt-block--alt2"><span class="hw">catch</span> <span class="pos" title="A word that refers to a person, place, idea, event or thing.">noun</span> <span class="guideword" title="Guide word: helps you find the right meaning when a word has more than one meaning">
+ <div class="sense-block" id="english-chinese-traditional-1-2-4"> <h3 class="txt-block txt-block--alt2"><span class="hw">catch</span> <span class="pos" title="A word that refers to a person, place, idea, event or thing.">noun</span> <span class="guideword" title="Guide word: helps you find the right meaning when a word has more than one meaning">
(<span>STIFFNESS</span>)
- </span></h3>
- <div class="sense-body">
- <div class="def-block pad-indent" data-wl-senseid="ID_00004871_42"><p class="def-head semi-flush"><span class="def-info"><span class="freq">›</span> <span class="gram"><a href="https://dictionary.cambridge.org/zhs/help/codes.html">[<span class="gcs"> <span title="Countable noun: a noun that has both singular and plural forms." class="gc">C</span> or <span title="Uncountable noun: noun with no plural form. Cannot be used with 'a', 'an', or 'one'." class="gc">U</span> </span>]</a></span> <span class="lab"><span class="region">Indian English</span></span></span> <b class="def">a <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%B9%81%E4%BD%93/feeling" title="feeling">feeling</a> of <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%B9%81%E4%BD%93/stiffness" title="stiffness">stiffness</a> in <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%B9%81%E4%BD%93/part" title="part">part</a> of <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%B9%81%E4%BD%93/your" title="your">your</a> <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%B9%81%E4%BD%93/body" title="body">body</a></b></p><span class="def-body">
- <span class="trans" lang="zh-Hant">
-
- （身體部位）僵硬，強直</span>
- <div class="examp emphasized"> <span title="Example" class="eg">She would <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%B9%81%E4%BD%93/complain" title="complain">complain</a> of catch in the <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%B9%81%E4%BD%93/joint" title="joints">joints</a> during <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%B9%81%E4%BD%93/winter" title="winter">winter</a>.</span>
- <span class="trans" lang="zh-Hant">
-
- 冬天的時候她會說自己關節僵硬。</span>
+ </span></h3> <div class="sense-body">
+ <div class="def-block pad-indent" data-wl-senseid="ID_00004871_42"><p class="def-head semi-flush"><span class="def-info"><span class="freq">›</span> <span class="gram"><a href="https://dictionary.cambridge.org/zhs/help/codes.html">[<span class="gcs"> <span class="gc">C</span> or <span class="gc">U</span> </span>]</a></span> <span class="lab"><span class="region">Indian English</span></span></span> <b class="def">a <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%B9%81%E4%BD%93/feeling" title="feeling">feeling</a> of <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%B9%81%E4%BD%93/stiffness" title="stiffness">stiffness</a> in <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%B9%81%E4%BD%93/part" title="part">part</a> of <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%B9%81%E4%BD%93/your" title="your">your</a> <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%B9%81%E4%BD%93/body" title="body">body</a></b></p><span class="def-body">
+ <span class="trans" lang="zh-Hant">（身體部位）僵硬，強直</span>
+ <div class="examp emphasized"> <span class="eg">She would <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%B9%81%E4%BD%93/complain" title="complain">complain</a> of catch in the <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%B9%81%E4%BD%93/joint" title="joints">joints</a> during <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%B9%81%E4%BD%93/winter" title="winter">winter</a>.</span>
+ <span class="trans" lang="zh-Hant">冬天的時候她會說自己關節僵硬。</span>
</div></span></div>
+ </div> </div></div></div></div></div></div><div class="definition-src"><p><small>
+ (catch在<a href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%B9%81%E4%BD%93/" title="剑桥英语 - 汉语（繁体）词典" class="a--rev"><b>剑桥英语 - 汉语（繁体）词典</b></a>的翻译 © Cambridge University Press)
+ </small></p></div></div>
</div>
- </div></div></div></div></div></div></div>
- </div>
-
- <div class="definition-src"><p><small>
- (catch在<a href='https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%B9%81%E4%BD%93/' title='剑桥英语 - 汉语（繁体）词典' class='a--rev'><b>剑桥英语 - 汉语（繁体）词典</b></a>的翻译 ©剑桥大学出版社)
- </small></p></div>
-
<div class="clrd mod mod--style5 mod--dark mod-translate">
<div class="pad mod-translate__lang bg-h round-right-aft" id="translations">
<div><h2 class="h3">“catch”的翻译</h2></div>
@@ -1474,26 +1469,36 @@ <h3 class="txt-block txt-block--alt2"><span class="hw">catch</span> <span class=
<div id="cdo-translation-opt" class="dropdown__box rounded">
<ul class="unstyled">
+ <li><a href="#" data-dataset="english-french">在法语中</a></li>
<li><a href="#" data-dataset="english-japanese">在日语中</a></li>
<li><a href="#" data-dataset="english-catalan">在加泰罗尼亚语中</a></li>
<li><a href="#" data-dataset="english-arabic">在阿拉伯语中</a></li>
+ <li><a href="#" data-dataset="english-danish">in Danish</a></li>
+ <li><a href="#" data-dataset="english-czech">in Czech</a></li>
<li><a href="#" data-dataset="english-indonesian">在印尼语中</a></li>
- <li><a href="#" data-dataset="english-thai">在泰语中</a></li>
<li><a href="#" data-dataset="english-vietnamese">在越南语中</a></li>
+ <li><a href="#" data-dataset="english-thai">在泰语中</a></li>
<li><a href="#" data-dataset="english-polish">在波兰语中</a></li>
<li><a href="#" data-dataset="english-malaysian">在马来语中</a></li>
<li><a href="#" data-dataset="turkish">在土耳其语中</a></li>
+ <li><a href="#" data-dataset="english-german">在德语中</a></li>
+ <li><a href="#" data-dataset="english-norwegian">in Norwegian</a></li>
<li><a href="#" data-dataset="english-korean">在韩语中</a></li>
<li><a href="#" data-dataset="english-portuguese">在葡萄牙语中</a></li>
+ <li><a href="#" data-dataset="english-chinese-simplified">在汉语（简体）中</a></li>
<li><a href="#" data-dataset="english-italian">在意大利语中</a></li>
<li><a href="#" data-dataset="english-russian">在俄语中</a></li>
- <li><a href="#" data-dataset="english-chinese-simplified">在汉语（简体）中</a></li>
- <li><a href="#" data-dataset="english-spanish">在西班牙语中</a></li>
</ul>
</div>
</div>
<ul id="cdo-translation-val" class="unstyled">
+ <li data-dataset="english-french">
+ <a href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B3%95%E8%AF%AD/catch" title="catch：法语翻译" class="helper ico-bg-abs ico-bg--arrow-end">
+ <span class="point"></span>
+ <p class="flush">attraper, surprendre, piger…</p>
+ </a>
+ </li>
<li data-dataset="english-japanese">
<a href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%97%A5%E8%AF%AD/catch" title="catch：日语翻译" class="helper ico-bg-abs ico-bg--arrow-end">
<span class="point"></span>
@@ -1512,16 +1517,22 @@ <h3 class="txt-block txt-block--alt2"><span class="hw">catch</span> <span class=
<p class="flush">يَلْتَقِط, يَلْحَق, يُصاب…</p>
</a>
</li>
- <li data-dataset="english-indonesian">
- <a href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E5%8D%B0%E5%BA%A6%E5%B0%BC%E8%A5%BF%E4%BA%9A%E8%AF%AD/catch_1" title="catch：印尼语翻译" class="helper ico-bg-abs ico-bg--arrow-end">
+ <li data-dataset="english-danish">
+ <a href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E4%B8%B9%E9%BA%A6%E8%AF%AD/catch" title="catch: Danish translation" class="helper ico-bg-abs ico-bg--arrow-end">
<span class="point"></span>
- <p class="flush">menangkap, tepat waktu untuk, memergoki…</p>
+ <p class="flush">fange, nå, overraske…</p>
</a>
</li>
- <li data-dataset="english-thai">
- <a href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B3%B0%E8%AF%AD/catch_1" title="catch：泰语翻译" class="helper ico-bg-abs ico-bg--arrow-end">
+ <li data-dataset="english-czech">
+ <a href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%8D%B7%E5%85%8B%E8%AF%AD/catch" title="catch: Czech translation" class="helper ico-bg-abs ico-bg--arrow-end">
<span class="point"></span>
- <p class="flush">จับ, มาทัน, จับได้…</p>
+ <p class="flush">chytit, upoutat, stihnout…</p>
+ </a>
+ </li>
+ <li data-dataset="english-indonesian">
+ <a href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E5%8D%B0%E5%BA%A6%E5%B0%BC%E8%A5%BF%E4%BA%9A%E8%AF%AD/catch_1" title="catch：印尼语翻译" class="helper ico-bg-abs ico-bg--arrow-end">
+ <span class="point"></span>
+ <p class="flush">menangkap, tepat waktu untuk, memergoki…</p>
</a>
</li>
<li data-dataset="english-vietnamese">
@@ -1529,6 +1540,12 @@ <h3 class="txt-block txt-block--alt2"><span class="hw">catch</span> <span class=
<span class="point"></span>
<p class="flush">bắt lấy, lên tàu, xe…</p>
</a>
+ </li>
+ <li data-dataset="english-thai">
+ <a href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B3%B0%E8%AF%AD/catch_1" title="catch：泰语翻译" class="helper ico-bg-abs ico-bg--arrow-end">
+ <span class="point"></span>
+ <p class="flush">จับ, มาทัน, จับได้…</p>
+ </a>
</li>
<li data-dataset="english-polish">
<a href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B3%A2%E5%85%B0%E8%AF%AD/catch_1" title="catch：波兰语翻译" class="helper ico-bg-abs ico-bg--arrow-end">
@@ -1547,6 +1564,18 @@ <h3 class="txt-block txt-block--alt2"><span class="hw">catch</span> <span class=
<span class="point"></span>
<p class="flush">tutmak, alıkoymak, bulup yakalamak…</p>
</a>
+ </li>
+ <li data-dataset="english-german">
+ <a href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E5%BE%B7%E8%AF%AD/catch" title="catch：德语翻译" class="helper ico-bg-abs ico-bg--arrow-end">
+ <span class="point"></span>
+ <p class="flush">fangen, erreichen, ertappen…</p>
+ </a>
+ </li>
+ <li data-dataset="english-norwegian">
+ <a href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%8C%AA%E5%A8%81%E8%AF%AD/catch" title="catch: Norwegian translation" class="helper ico-bg-abs ico-bg--arrow-end">
+ <span class="point"></span>
+ <p class="flush">ta imot, se, få…</p>
+ </a>
</li>
<li data-dataset="english-korean">
<a href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E9%9F%A9%E8%AF%AD/catch" title="catch：韩语翻译" class="helper ico-bg-abs ico-bg--arrow-end">
@@ -1559,6 +1588,12 @@ <h3 class="txt-block txt-block--alt2"><span class="hw">catch</span> <span class=
<span class="point"></span>
<p class="flush">apanhar, pegar (ônibus, trem…</p>
</a>
+ </li>
+ <li data-dataset="english-chinese-simplified">
+ <a href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%AE%80%E4%BD%93/catch" title="catch：汉语（简体）翻译" class="helper ico-bg-abs ico-bg--arrow-end">
+ <span class="point"></span>
+ <p class="flush">抓住, 抓住，接住, 阻止逃跑…</p>
+ </a>
</li>
<li data-dataset="english-italian">
<a href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%84%8F%E5%A4%A7%E5%88%A9%E8%AF%AD/catch" title="catch：意大利语翻译" class="helper ico-bg-abs ico-bg--arrow-end">
@@ -1571,18 +1606,6 @@ <h3 class="txt-block txt-block--alt2"><span class="hw">catch</span> <span class=
<span class="point"></span>
<p class="flush">ловить, поймать, задерживать…</p>
</a>
- </li>
- <li data-dataset="english-chinese-simplified">
- <a href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%AE%80%E4%BD%93/catch" title="catch：汉语（简体）翻译" class="helper ico-bg-abs ico-bg--arrow-end">
- <span class="point"></span>
- <p class="flush">抓住, 抓住，接住, 阻止逃跑…</p>
- </a>
- </li>
- <li data-dataset="english-spanish">
- <a href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E8%A5%BF%E7%8F%AD%E7%89%99%E8%AF%AD/catch_1" title="catch：西班牙语翻译" class="helper ico-bg-abs ico-bg--arrow-end">
- <span class="point"></span>
- <p class="flush">coger, atrapar, llegar a tiempo…</p>
- </a>
</li>
</ul>
@@ -1594,23 +1617,7 @@ <h3 class="txt-block txt-block--alt2"><span class="hw">catch</span> <span class=
</div>
</div>
- </div>
-
- <div class="clrd">
- <div class="mod float-xl">
-
- <div id='ad_btmslot_a' class='am-default '>
- <script type='text/javascript'>
- googletag.cmd.push(function() { googletag.display('ad_btmslot_a'); });
- </script>
- </div>
- <div id='ad_houseslot_b' class='am-default '>
- <script type='text/javascript'>
- googletag.cmd.push(function() { googletag.display('ad_houseslot_b'); });
- </script>
- </div>
- </div>
</div>
<div class="clrd">
@@ -1622,32 +1629,48 @@ <h3 class="txt-block txt-block--alt2"><span class="hw">catch</span> <span class=
<div class="oflow-hide scroller scroller--blur js-scroller grad-trans-pseudo">
<div class="scroller__content js-scroller-content">
<ul class="unstyled a--b a--rev a--alt">
- <li>
- <a href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%B9%81%E4%BD%93/catarrh" title="catarrh"><span class="entry_title"><span class="results"><span class="base"><b class="hw">catarrh</b></span></span></span></a>
+ <li>
+ <a href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%B9%81%E4%BD%93/catarrh" title="catarrh">
+ <span class="entry_title"><span class="results"><span class="base"><b class="hw">catarrh</b></span></span></span>
+ </a>
</li>
- <li>
- <a href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%B9%81%E4%BD%93/catastrophe" title="catastrophe"><span class="entry_title"><span class="results"><span class="base"><b class="hw">catastrophe</b></span></span></span></a>
+ <li>
+ <a href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%B9%81%E4%BD%93/catastrophe" title="catastrophe">
+ <span class="entry_title"><span class="results"><span class="base"><b class="hw">catastrophe</b></span></span></span>
+ </a>
</li>
- <li>
- <a href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%B9%81%E4%BD%93/catatonic" title="catatonic"><span class="entry_title"><span class="results"><span class="base"><b class="hw">catatonic</b></span></span></span></a>
+ <li>
+ <a href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%B9%81%E4%BD%93/catatonic" title="catatonic">
+ <span class="entry_title"><span class="results"><span class="base"><b class="hw">catatonic</b></span></span></span>
+ </a>
</li>
- <li>
- <a href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%B9%81%E4%BD%93/catcall" title="catcall"><span class="entry_title"><span class="results"><span class="base"><b class="hw">catcall</b></span></span></span></a>
+ <li>
+ <a href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%B9%81%E4%BD%93/catcall" title="catcall">
+ <span class="entry_title"><span class="results"><span class="base"><b class="hw">catcall</b></span></span></span>
+ </a>
</li>
- <li>
+ <li>
<span class="entry_title"><span class="results"><span class="base"><b class="hw">catch</b></span></span></span>
+ </li>
+ <li>
+ <a href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%B9%81%E4%BD%93/catch-sb-up" title="catch (sb) up">
+ <span class="entry_title"><span class="results"><span class="base"><b class="phrase">catch <i class="obj" title="sb: abbreviation for somebody.">(sb)</i> up</b></span></span></span>
+ </a>
</li>
- <li>
- <a href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%B9%81%E4%BD%93/catch-sb-up" title="catch (sb) up"><span class="entry_title"><span class="results"><span class="base"><b class="phrase">catch <i class="obj" title="sb: abbreviation for somebody.">(sb)</i> up</b></span></span></span></a>
- </li>
- <li>
- <a href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%B9%81%E4%BD%93/catch-on" title="catch on"><span class="entry_title"><span class="results"><span class="base"><b class="phrase">catch on</b></span></span></span></a>
+ <li>
+ <a href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%B9%81%E4%BD%93/catch-on" title="catch on">
+ <span class="entry_title"><span class="results"><span class="base"><b class="phrase">catch on</b></span></span></span>
+ </a>
</li>
- <li>
- <a href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%B9%81%E4%BD%93/catch-sb-napping" title="catch sb napping idiom"><span class="entry_title"><span class="results"><span class="base"><b class="phrase">catch <i class="obj" title="sb: abbreviation for somebody.">sb</i> napping</b></span> <span class="pos">idiom</span></span></span></a>
+ <li>
+ <a href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%B9%81%E4%BD%93/catch-sb-napping" title="catch sb napping idiom">
+ <span class="entry_title"><span class="results"><span class="base"><b class="phrase">catch <i class="obj" title="sb: abbreviation for somebody.">sb</i> napping</b></span> <span class="pos">idiom</span></span></span>
+ </a>
</li>
- <li>
- <a href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%B9%81%E4%BD%93/catch-sb-off-guard" title="catch sb off guard idiom"><span class="entry_title"><span class="results"><span class="base"><b class="phrase">catch <i class="obj" title="sb: abbreviation for somebody.">sb</i> off guard</b></span> <span class="pos">idiom</span></span></span></a>
+ <li>
+ <a href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%B9%81%E4%BD%93/catch-sb-off-guard" title="catch sb off guard idiom">
+ <span class="entry_title"><span class="results"><span class="base"><b class="phrase">catch <i class="obj" title="sb: abbreviation for somebody.">sb</i> off guard</b></span> <span class="pos">idiom</span></span></span>
+ </a>
</li>
</ul>
</div>
@@ -1656,20 +1679,37 @@ <h3 class="txt-block txt-block--alt2"><span class="hw">catch</span> <span class=
</div>
</div>
+ <div class="clrd">
+ <div class="mod float-xl">
+
+ <div id='ad_btmslot_a' class='am-default '>
+ <script type='text/javascript'>
+ googletag.cmd.push(function() { googletag.display('ad_btmslot_a'); });
+ </script>
+ </div>
+
+ <div id='ad_houseslot_b' class='am-default '>
+ <script type='text/javascript'>
+ googletag.cmd.push(function() { googletag.display('ad_houseslot_b'); });
+ </script>
+ </div>
+ </div>
+ </div>
+
</div>
<div class="cdo-tpl__z cdo-tpl-main__z3 clrd">
- <div class="mod mod--dark mod--style1">
- <div class="pad">
- <p class="leader">免费创建并分享自己的单词列表和小测验！</p>
- <p>
- <a href="#" class="btn btn--impact btn--s13 js-toggle" data-target-selector="#modal-login"><b>现在就注册</b></a>
- <a href="#" class="btn btn--impact2 btn--s13 js-toggle" data-target-selector="#modal-login"><b>登录</b></a>
- </p>
+ <div class="mod mod--style1 pad">
+ <div class="pad">
+ <div class="h2 semi-flush">我的词典</div>
+ <p>免费创建并分享自己的单词列表和小测验！</p>
+ <p>
+ <a class="btn btn--white btn--s13 registerBtn btn--forbidden"><b>现在就注册</b></a>
+ <a class="btn btn--impact2 btn--s13 loginBtn btn--forbidden"><b>登录</b></a>
+ </p>
</div>
- </div>
-
+</div>
<div id='ad_rightslot' class='am-default '>
@@ -1678,126 +1718,126 @@ <h3 class="txt-block txt-block--alt2"><span class="hw">catch</span> <span class=
</script>
</div>
- <div class="mod mod--style4 mod--border">
- <h2 class="h3 txt-block txt-block--alt round-top flush">
- “catch”更多的汉语(繁体)翻译
- </h2>
-
- <div class="tabs tabs--block js-tabs-wrap clrd">
- <div class="tabs__tabs js-tabs">
- <ul>
-
- <li>
- <a href="#more-results" data-tab="all" class="on"
- title="“catch”在英语-汉语（繁体）中的全部意思">
- 全部
- </a>
- </li>
- <li>
- <a href="#more-results-pv" data-tab="pv"
- title="英语-汉语（繁体）里“catch”在词组动词中的意思">
- 词组动词
- </a>
- </li>
- <li>
- <a href="#more-results-idioms" data-tab="idioms"
- title="英语-汉语（繁体）里“catch”在惯用语中的意思">
- 惯用语
- </a>
- </li>
- </ul>
- </div>
-
- <div class="tabs__content mod-more on" data-tab="all" id="more-results">
- <div class="pad">
- <ul class="unstyled link-list results">
-
- <li>
- <a href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%B9%81%E4%BD%93/catch-22" data-gaCategory="more-result" data-gaAction="more-result-link" title="catch-22" class="moreResult">
- <span class='arl3'><span class="base"><b class="hw">catch-22</b></span></span>
- </a>
- </li>
-
- <li>
- <a href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%B9%81%E4%BD%93/catch-up" data-gaCategory="more-result" data-gaAction="more-result-link" title="catch-up" class="moreResult">
- <span class='arl3'><span class="base"><b class="hw">catch-up</b></span></span>
- </a>
- </li>
-
- <li>
- <a href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%B9%81%E4%BD%93/catch-up-tv" data-gaCategory="more-result" data-gaAction="more-result-link" title="catch-up TV" class="moreResult">
- <span class='arl3'><span class="base"><b class="hw">catch-up TV</b></span></span>
- </a>
- </li>
-
- <li>
- <a href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%B9%81%E4%BD%93/catch-on" data-gaCategory="more-result" data-gaAction="more-result-link" title="catch on" class="moreResult">
- <span class='arl5'><span class="base"><b class="phrase">catch on</b></span></span>
- </a>
- </li>
-
- <li>
- <a href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%B9%81%E4%BD%93/catch-all" data-gaCategory="more-result" data-gaAction="more-result-link" title="catch-all" class="moreResult">
- <span class='arl3'><span class="base"><b class="hw">catch-all</b></span></span>
- </a>
- </li>
-
- <li>
- <a href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%B9%81%E4%BD%93/catch-up" data-gaCategory="more-result" data-gaAction="more-result-link" title="catch up" class="moreResult">
- <span class='arl5'><span class="base"><b class="phrase">catch up</b></span></span>
- </a>
- </li>
-
- <li>
- <a href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%B9%81%E4%BD%93/safety-catch" data-gaCategory="more-result" data-gaAction="more-result-link" title="safety catch" class="moreResult">
- <span class='arl3'><span class="base"><b class="hw">safety catch</b></span></span>
- </a>
- </li>
- </ul>
- </div>
- <a href="https://dictionary.cambridge.org/zhs/%E6%90%9C%E7%B4%A2/english-chinese-traditional/?q=catch" class="txt-block"
- title="在英语-汉语（繁体）中关于catch的所有意思"
- onClick="ga('send','event', 'more-result', 'see-all-meaning' );">
- <span>查看全部意思»</span> <i class="fcdo fcdo-angle-right" aria-hidden="true"></i>
- </a>
- </div>
-
- <div class="tabs__content mod-more" data-tab="pv" id="more-results-pv">
- <div class="pad">
- <ul class="unstyled link-list results">
- <li><a href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%B9%81%E4%BD%93/catch-sb-out" title="catch sb out"><span class='arl5'><span class="base"><b class="phrase">catch <i title="sb: abbreviation for somebody." class="obj">sb</i> out</b></span></span></a></li>
- <li><a href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%B9%81%E4%BD%93/catch-on" title="catch on"><span class='arl5'><span class="base"><b class="phrase">catch on</b></span></span></a></li>
- <li><a href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%B9%81%E4%BD%93/catch-sb-up-on-sth" title="catch sb up on sth"><span class='arl5'><span class="base"><b class="phrase">catch <i class="obj" title="sb: abbreviation for somebody.">sb</i> up on <i class="obj" title="sth: abbreviation for something.">sth</i></b></span></span></a></li>
- <li><a href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%B9%81%E4%BD%93/catch-up-with-sb" title="catch up with sb"><span class='arl5'><span class="base"><b class="phrase">catch up with <i class="obj" title="sb: abbreviation for somebody.">sb</i></b></span></span></a></li>
- <li><a href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%B9%81%E4%BD%93/catch-up" title="catch up"><span class='arl5'><span class="base"><b class="phrase">catch up</b></span></span></a></li>
- <li><a href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%B9%81%E4%BD%93/catch-sb-up" title="catch (sb) up"><span class='arl5'><span class="base"><b class="phrase">catch <i title="sb: abbreviation for somebody." class="obj">(sb)</i> up</b></span></span></a></li>
- </ul>
- </div>
- <a href="https://dictionary.cambridge.org/zhs/%E6%90%9C%E7%B4%A2/english-chinese-traditional/?q=catch&type=pv" class="txt-block"
- title="在英语-汉语（繁体）中关于catch的所有动词词组意思">
- <span>查看全部动词词组意思»</span> <i class="fcdo fcdo-angle-right"></i>
- </a>
- </div>
-
- <div class="tabs__content mod-more" data-tab="idioms" id="more-results-idioms">
- <div class="pad">
- <ul class="unstyled link-list results">
- <li><a href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%B9%81%E4%BD%93/catch-sb-on-the-hop" title="catch sb on the hop idiom"><span class='arl7'><span class="base"><b class="phrase">catch <i class="obj" title="sb: abbreviation for somebody.">sb</i> on the hop</b></span> <span class="pos">idiom</span></span></a></li>
- <li><a href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%B9%81%E4%BD%93/catch-sb-s-eye" title="catch sb's eye idiom"><span class='arl7'><span class="base"><b class="phrase">catch <i class="obj">sb's</i> eye</b></span> <span class="pos">idiom</span></span></a></li>
- <li><a href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%B9%81%E4%BD%93/catch-sb-with-their-pants-trousers-down" title="catch sb with their pants/trousers down idiom"><span class='arl7'><span class="base"><b class="phrase">catch <i class="obj" title="sb: abbreviation for somebody.">sb</i> with <i class="obj">their</i> pants/trousers down</b></span> <span class="pos">idiom</span></span></a></li>
- <li><a href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%B9%81%E4%BD%93/catch-sb-red-handed" title="catch sb red-handed idiom"><span class='arl7'><span class="base"><b class="phrase">catch <i class="obj" title="sb: abbreviation for somebody.">sb</i> red-handed</b></span> <span class="pos">idiom</span></span></a></li>
- <li><a href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%B9%81%E4%BD%93/catch-sb-napping" title="catch sb napping idiom"><span class='arl7'><span class="base"><b class="phrase">catch <i title="sb: abbreviation for somebody." class="obj">sb</i> napping</b></span> <span class="pos">idiom</span></span></a></li>
- <li><a href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%B9%81%E4%BD%93/see-catch-you-later" title="see/catch you later! idiom"><span class='arl7'><span class="base"><b class="phrase">see/catch you later!</b></span> <span class="pos">idiom</span></span></a></li>
- <li><a href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%B9%81%E4%BD%93/catch-sb-off-guard" title="catch sb off guard idiom"><span class='arl7'><span class="base"><b class="phrase">catch <i title="sb: abbreviation for somebody." class="obj">sb</i> off guard</b></span> <span class="pos">idiom</span></span></a></li>
- </ul>
- </div>
-
- <a href="https://dictionary.cambridge.org/zhs/%E6%90%9C%E7%B4%A2/english-chinese-traditional/?q=catch&type=idiom" class="txt-block"
- title="在英语-汉语（繁体）中关于catch的所有惯用语意思">
- <span>查看全部惯用语意思»</span> <i class="fcdo fcdo-angle-right"></i>
- </a>
- </div>
- </div>
+
+ <div class="mod mod--style4 mod--border">
+ <h2 class="h3 txt-block txt-block--alt round-top flush">
+ “catch”更多的汉语(繁体)翻译
+ </h2>
+
+ <div class="tabs tabs--block js-tabs-wrap clrd">
+ <div class="tabs__tabs js-tabs">
+ <ul>
+ <li>
+ <a href="#more-results" data-tab="all" class="on"
+ title="“catch”在英语-汉语（繁体）中的全部意思">
+ 全部
+ </a>
+ </li>
+ <li>
+ <a href="#more-results-pv" data-tab="pv"
+ title="英语-汉语（繁体）里“catch”在词组动词中的意思">
+ 词组动词
+ </a>
+ </li>
+ <li>
+ <a href="#more-results-idioms" data-tab="idioms"
+ title="英语-汉语（繁体）里“catch”在惯用语中的意思">
+ 惯用语
+ </a>
+ </li>
+ </ul>
+ </div>
+
+ <div class="tabs__content mod-more on" data-tab="all" id="more-results">
+ <div class="pad">
+ <ul class="unstyled link-list results">
+
+ <li>
+ <a href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%B9%81%E4%BD%93/catch-up" data-gaCategory="more-result" data-gaAction="more-result-link" title="catch-up" class="moreResult">
+ <span class='arl3'><span class="base"><b class="hw">catch-up</b></span></span>
+ </a>
+ </li>
+
+ <li>
+ <a href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%B9%81%E4%BD%93/catch-22" data-gaCategory="more-result" data-gaAction="more-result-link" title="catch-22" class="moreResult">
+ <span class='arl3'><span class="base"><b class="hw">catch-22</b></span></span>
+ </a>
+ </li>
+
+ <li>
+ <a href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%B9%81%E4%BD%93/catch-all" data-gaCategory="more-result" data-gaAction="more-result-link" title="catch-all" class="moreResult">
+ <span class='arl3'><span class="base"><b class="hw">catch-all</b></span></span>
+ </a>
+ </li>
+
+ <li>
+ <a href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%B9%81%E4%BD%93/catch-up-tv" data-gaCategory="more-result" data-gaAction="more-result-link" title="catch-up TV" class="moreResult">
+ <span class='arl3'><span class="base"><b class="hw">catch-up TV</b></span></span>
+ </a>
+ </li>
+
+ <li>
+ <a href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%B9%81%E4%BD%93/safety-catch" data-gaCategory="more-result" data-gaAction="more-result-link" title="safety catch" class="moreResult">
+ <span class='arl3'><span class="base"><b class="hw">safety catch</b></span></span>
+ </a>
+ </li>
+
+ <li>
+ <a href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%B9%81%E4%BD%93/catch-on" data-gaCategory="more-result" data-gaAction="more-result-link" title="catch on" class="moreResult">
+ <span class='arl5'><span class="base"><b class="phrase">catch on</b></span></span>
+ </a>
+ </li>
+
+ <li>
+ <a href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%B9%81%E4%BD%93/catch-up" data-gaCategory="more-result" data-gaAction="more-result-link" title="catch up" class="moreResult">
+ <span class='arl5'><span class="base"><b class="phrase">catch up</b></span></span>
+ </a>
+ </li>
+ </ul>
+ </div>
+ <a href="https://dictionary.cambridge.org/zhs/%E6%90%9C%E7%B4%A2/english-chinese-traditional/?q=catch" class="txt-block"
+ title="在英语-汉语（繁体）中关于catch的所有意思"
+ onClick="ga('send','event', 'more-result', 'see-all-meaning' );">
+ <span>查看全部意思»</span> <i class="fcdo fcdo-angle-right" aria-hidden="true"></i>
+ </a>
+ </div>
+
+ <div class="tabs__content mod-more" data-tab="pv" id="more-results-pv">
+ <div class="pad">
+ <ul class="unstyled link-list results">
+ <li><a href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%B9%81%E4%BD%93/catch-on" title="catch on"><span class='arl5'><span class="base"><b class="phrase">catch on</b></span></span></a></li>
+ <li><a href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%B9%81%E4%BD%93/catch-up" title="catch up"><span class='arl5'><span class="base"><b class="phrase">catch up</b></span></span></a></li>
+ <li><a href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%B9%81%E4%BD%93/catch-sb-up" title="catch (sb) up"><span class='arl5'><span class="base"><b class="phrase">catch <i title="sb: abbreviation for somebody." class="obj">(sb)</i> up</b></span></span></a></li>
+ <li><a href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%B9%81%E4%BD%93/catch-sb-up-on-sth" title="catch sb up on sth"><span class='arl5'><span class="base"><b class="phrase">catch <i title="sb: abbreviation for somebody." class="obj">sb</i> up on <i title="sth: abbreviation for something." class="obj">sth</i></b></span></span></a></li>
+ <li><a href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%B9%81%E4%BD%93/catch-sb-out" title="catch sb out"><span class='arl5'><span class="base"><b class="phrase">catch <i title="sb: abbreviation for somebody." class="obj">sb</i> out</b></span></span></a></li>
+ <li><a href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%B9%81%E4%BD%93/catch-up-with-sb" title="catch up with sb"><span class='arl5'><span class="base"><b class="phrase">catch up with <i class="obj" title="sb: abbreviation for somebody.">sb</i></b></span></span></a></li>
+ </ul>
+ </div>
+ <a href="https://dictionary.cambridge.org/zhs/%E6%90%9C%E7%B4%A2/english-chinese-traditional/?q=catch&type=pv" class="txt-block"
+ title="在英语-汉语（繁体）中关于catch的所有动词词组意思">
+ <span>查看全部动词词组意思»</span> <i class="fcdo fcdo-angle-right"></i>
+ </a>
+ </div>
+
+ <div class="tabs__content mod-more" data-tab="idioms" id="more-results-idioms">
+ <div class="pad">
+ <ul class="unstyled link-list results">
+ <li><a href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%B9%81%E4%BD%93/catch-sb-s-eye" title="catch sb's eye idiom"><span class='arl7'><span class="base"><b class="phrase">catch <i class="obj">sb's</i> eye</b></span> <span class="pos">idiom</span></span></a></li>
+ <li><a href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%B9%81%E4%BD%93/catch-sb-napping" title="catch sb napping idiom"><span class='arl7'><span class="base"><b class="phrase">catch <i class="obj" title="sb: abbreviation for somebody.">sb</i> napping</b></span> <span class="pos">idiom</span></span></a></li>
+ <li><a href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%B9%81%E4%BD%93/catch-sb-red-handed" title="catch sb red-handed idiom"><span class='arl7'><span class="base"><b class="phrase">catch <i title="sb: abbreviation for somebody." class="obj">sb</i> red-handed</b></span> <span class="pos">idiom</span></span></a></li>
+ <li><a href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%B9%81%E4%BD%93/catch-sb-with-their-pants-trousers-down" title="catch sb with their pants/trousers down idiom"><span class='arl7'><span class="base"><b class="phrase">catch <i title="sb: abbreviation for somebody." class="obj">sb</i> with <i class="obj">their</i> pants/trousers down</b></span> <span class="pos">idiom</span></span></a></li>
+ <li><a href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%B9%81%E4%BD%93/catch-sb-off-guard" title="catch sb off guard idiom"><span class='arl7'><span class="base"><b class="phrase">catch <i title="sb: abbreviation for somebody." class="obj">sb</i> off guard</b></span> <span class="pos">idiom</span></span></a></li>
+ <li><a href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%B9%81%E4%BD%93/see-catch-you-later" title="see/catch you later! idiom"><span class='arl7'><span class="base"><b class="phrase">see/catch you later!</b></span> <span class="pos">idiom</span></span></a></li>
+ <li><a href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%B9%81%E4%BD%93/catch-sb-on-the-hop" title="catch sb on the hop idiom"><span class='arl7'><span class="base"><b class="phrase">catch <i class="obj" title="sb: abbreviation for somebody.">sb</i> on the hop</b></span> <span class="pos">idiom</span></span></a></li>
+ </ul>
+ </div>
+
+ <a href="https://dictionary.cambridge.org/zhs/%E6%90%9C%E7%B4%A2/english-chinese-traditional/?q=catch&type=idiom" class="txt-block"
+ title="在英语-汉语（繁体）中关于catch的所有惯用语意思">
+ <span>查看全部惯用语意思»</span> <i class="fcdo fcdo-angle-right"></i>
+ </a>
+ </div>
+ </div>
</div>
@@ -1807,81 +1847,73 @@ <h2 class="h3 txt-block txt-block--alt round-top flush">
</script>
</div>
-
-<div class="mod mod--dark mod--style2 oflow-hide">
+ <div class="mod mod--dark mod--style2 oflow-hide">
<div class="pad">
<p class="h2 semi-flush alt">“每日一词”</p>
- <p class="h4 feature-w-big wotd-hw">eyeliner</p><p>a coloured substance, usually contained in a pencil, that is put in a line just above or below the eyes in order to make them look more attractive</p>
+ <p class="h4 feature-w-big wotd-hw">magical</p><p>produced by or using magic</p>
</div>
<div class="txt-block txt-block--alt with-icons js-eqh-sticky">
<div class="with-icons__content">
- <a href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E5%BC%8F%E8%8B%B1%E8%AF%AD/eyeliner" class="a--rev a--b">
+ <a href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD/magical" class="a--rev a--b">
<span>关于这个</span> <i class="fcdo fcdo-angle-right" aria-hidden="true"></i>
</a>
</div>
<div class="with-icons__icons">
- <a class="circle circle-btn socialShareLink" title="在Facebook上分享该词条" href='https://www.facebook.com/sharer.php?u=https%3A%2F%2Fdictionary.cambridge.org%2Fzhs%2F%25E8%25AF%258D%25E5%2585%25B8%2F%25E8%258B%25B1%25E5%25BC%258F%25E8%258B%25B1%25E8%25AF%25AD%2Feyeliner&t=%E2%80%9C%E6%AF%8F%E6%97%A5%E4%B8%80%E8%AF%8D%E2%80%9D' target='_blank' data-social='facebook' data-url='https://www.facebook.com/sharer.php?u=https%3A%2F%2Fdictionary.cambridge.org%2Fzhs%2F%25E8%25AF%258D%25E5%2585%25B8%2F%25E8%258B%25B1%25E5%25BC%258F%25E8%258B%25B1%25E8%25AF%25AD%2Feyeliner&t=%E2%80%9C%E6%AF%8F%E6%97%A5%E4%B8%80%E8%AF%8D%E2%80%9D' data-object='wotd'>
+ <a class="circle circle-btn socialShareLink" title="在Facebook上分享该词条" href='https://www.facebook.com/sharer.php?u=https%3A%2F%2Fdictionary.cambridge.org%2Fzhs%2F%25E8%25AF%258D%25E5%2585%25B8%2F%25E8%258B%25B1%25E8%25AF%25AD%2Fmagical&t=%E2%80%9C%E6%AF%8F%E6%97%A5%E4%B8%80%E8%AF%8D%E2%80%9D' target='_blank' data-social='facebook' data-url='https://www.facebook.com/sharer.php?u=https%3A%2F%2Fdictionary.cambridge.org%2Fzhs%2F%25E8%25AF%258D%25E5%2585%25B8%2F%25E8%258B%25B1%25E8%25AF%25AD%2Fmagical&t=%E2%80%9C%E6%AF%8F%E6%97%A5%E4%B8%80%E8%AF%8D%E2%80%9D' data-object='wotd'>
<i class="fcdo fcdo-facebook" aria-hidden="true"></i>
</a>
- <a class="circle circle-btn socialShareLink" title="用推特发送该词条" href='https://twitter.com/intent/tweet?url=https%3A%2F%2Fdictionary.cambridge.org%2Fzhs%2F%25E8%25AF%258D%25E5%2585%25B8%2F%25E8%258B%25B1%25E5%25BC%258F%25E8%258B%25B1%25E8%25AF%25AD%2Feyeliner' target='_blank' data-social='twitter' data-url='https://twitter.com/intent/tweet?url=https%3A%2F%2Fdictionary.cambridge.org%2Fzhs%2F%25E8%25AF%258D%25E5%2585%25B8%2F%25E8%258B%25B1%25E5%25BC%258F%25E8%258B%25B1%25E8%25AF%25AD%2Feyeliner' data-object='wotd'>
+ <a class="circle circle-btn socialShareLink" title="用推特发送该词条" href='https://twitter.com/intent/tweet?url=https%3A%2F%2Fdictionary.cambridge.org%2Fzhs%2F%25E8%25AF%258D%25E5%2585%25B8%2F%25E8%258B%25B1%25E8%25AF%25AD%2Fmagical' target='_blank' data-social='twitter' data-url='https://twitter.com/intent/tweet?url=https%3A%2F%2Fdictionary.cambridge.org%2Fzhs%2F%25E8%25AF%258D%25E5%2585%25B8%2F%25E8%258B%25B1%25E8%25AF%25AD%2Fmagical' data-object='wotd'>
<i class="fcdo fcdo-twitter" aria-hidden="true"></i>
</a>
- <a class="circle circle-btn socialShareLink" title="在Google+上分享该词条" href='https://plus.google.com/share?url=https%3A%2F%2Fdictionary.cambridge.org%2Fzhs%2F%25E8%25AF%258D%25E5%2585%25B8%2F%25E8%258B%25B1%25E5%25BC%258F%25E8%258B%25B1%25E8%25AF%25AD%2Feyeliner' target='_blank' data-social='google' data-url='https://plus.google.com/share?url=https%3A%2F%2Fdictionary.cambridge.org%2Fzhs%2F%25E8%25AF%258D%25E5%2585%25B8%2F%25E8%258B%25B1%25E5%25BC%258F%25E8%258B%25B1%25E8%25AF%25AD%2Feyeliner' data-object='wotd'>
+ <a class="circle circle-btn socialShareLink" title="在Google+上分享该词条" href='https://plus.google.com/share?url=https%3A%2F%2Fdictionary.cambridge.org%2Fzhs%2F%25E8%25AF%258D%25E5%2585%25B8%2F%25E8%258B%25B1%25E8%25AF%25AD%2Fmagical' target='_blank' data-social='google' data-url='https://plus.google.com/share?url=https%3A%2F%2Fdictionary.cambridge.org%2Fzhs%2F%25E8%25AF%258D%25E5%2585%25B8%2F%25E8%258B%25B1%25E8%25AF%25AD%2Fmagical' data-object='wotd'>
<i class="fcdo fcdo-google-plus" aria-hidden="true"></i>
</a>
-
-
- <a class="circle circle-btn socialShareLink" title="在StumbleUpon上分享该词条" href='https://www.stumbleupon.com/likecontent?url=https%3A%2F%2Fdictionary.cambridge.org%2Fzhs%2F%25E8%25AF%258D%25E5%2585%25B8%2F%25E8%258B%25B1%25E5%25BC%258F%25E8%258B%25B1%25E8%25AF%25AD%2Feyeliner' target='_blank' data-social='stumbleupon' data-url='https://www.stumbleupon.com/likecontent?url=https%3A%2F%2Fdictionary.cambridge.org%2Fzhs%2F%25E8%25AF%258D%25E5%2585%25B8%2F%25E8%258B%25B1%25E5%25BC%258F%25E8%258B%25B1%25E8%25AF%25AD%2Feyeliner' data-object='wotd'>
- <i class="fcdo fcdo-stumbleupon" aria-hidden="true"></i>
- </a>
</div>
</div>
</div>
<div class="cols cols--half">
-
-<div class="cols__col" >
+ <div class=" 'cols__col' " >
<div class="mod mod--border">
- <a href="https://dictionaryblog.cambridge.org/2018/05/23/out-of-the-blue-words-and-phrases-for-unexpected-events/" target="_blank" class="img">
- <img alt="Out of the blue (Words and phrases for unexpected events)" src="/zhs/rss/images/out-of-the-blue.jpg" />
+ <a href="https://dictionaryblog.cambridge.org/2018/12/19/do-help-yourself-the-language-of-party-food/" target="_blank" class="img">
+ <img alt="Do help yourself! (The language of party food)" src="/zhs/rss/images/help-yourself.jpg" />
</a>
<div class="pad">
<p class="h2 semi-flush">博客</p>
<p class="leader semi-flush">
- <a href="https://dictionaryblog.cambridge.org/2018/05/23/out-of-the-blue-words-and-phrases-for-unexpected-events/" class="a--alt a--rev" target="_blank">Out of the blue (Words and phrases for unexpected events)</a>
+ <a href="https://dictionaryblog.cambridge.org/2018/12/19/do-help-yourself-the-language-of-party-food/" class="a--alt a--rev" target="_blank">Do help yourself! (The language of party food)</a>
</p>
<p class="meta">
<small class="smaller">
- <time>May 23, 2018</time>
+ <time>December 19, 2018</time>
</small>
</p>
</div>
- <a href="https://dictionaryblog.cambridge.org/2018/05/23/out-of-the-blue-words-and-phrases-for-unexpected-events/" target="_blank" class="txt-block a--alt"><span>查看更多</span> <i class="fcdo fcdo-angle-right"></i></a>
+ <a href="https://dictionaryblog.cambridge.org/2018/12/19/do-help-yourself-the-language-of-party-food/" target="_blank" class="txt-block a--alt"><span>查看更多</span> <i class="fcdo fcdo-angle-right"></i></a>
</div>
</div>
-
-<div class="cols__col" >
+ <div class=" 'cols__col' " >
<div class="mod mod--dark mod--border mod--style3">
- <a href="https://dictionaryblog.cambridge.org/2018/05/21/new-words-21-may-2018/" target="_blank" class="img">
- <img alt="monkey dumpling noun" src="/zhs/rss/images/monkey-dumpling.jpg" />
+ <a href="https://dictionaryblog.cambridge.org/2018/12/17/new-words-17-december-2018/" target="_blank" class="img">
+ <img alt="social jetlag noun" src="/zhs/rss/images/social-jetlag.jpg" />
</a>
<div class="pad">
<p class="h2 alt semi-flush">新词</p>
<p class="h4 feature-w semi-flush nw-hw">
- <a href="https://dictionaryblog.cambridge.org/2018/05/21/new-words-21-may-2018/" class="a--alt a--rev" target="_blank">monkey dumpling noun</a>
+ <a href="https://dictionaryblog.cambridge.org/2018/12/17/new-words-17-december-2018/" class="a--alt a--rev" target="_blank">social jetlag noun</a>
</p>
<p>
- <small class="smaller"><time>May 21, 2018</time></small>
+ <small class="smaller"><time>December 17, 2018</time></small>
</p>
</div>
- <a href="https://dictionaryblog.cambridge.org/2018/05/21/new-words-21-may-2018/" target="_blank" class="txt-block txt-block--alt js-eqh-sticky">
+ <a href="https://dictionaryblog.cambridge.org/2018/12/17/new-words-17-december-2018/" target="_blank" class="txt-block txt-block--alt js-eqh-sticky">
<span>查看更多</span> <i class="fcdo fcdo-angle-right"></i>
</a>
</div>
@@ -1905,52 +1937,10 @@ <h2 class="h3 txt-block txt-block--alt round-top flush">
</article>
</div>
- <div class="modal modal--myd js-modal" id="modal-login">
-
- <div class="modal__main">
- <div class="modal__spacer">
- <div class="h1 center">登录"我的词典"</div>
- <br />
- <p>
- <a href='https://dictionary.cambridge.org/zhs/auth/socialauth?id=facebook&url=https%3A%2F%2Fdictionary.cambridge.org%2Fzhs%2F%E8%AF%8D%E5%85%B8%2F%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%B9%81%E4%BD%93%2Fcatch' class="btn btn--social bg--fb">
- <i class="fcdo fcdo-facebook" aria-hidden="true"></i> 使用Facebook账号登录 </a>
- <br />
- <a href='https://dictionary.cambridge.org/zhs/auth/socialauth?id=googleplus&url=https%3A%2F%2Fdictionary.cambridge.org%2Fzhs%2F%E8%AF%8D%E5%85%B8%2F%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%B9%81%E4%BD%93%2Fcatch' class="btn btn--social btn--right bg--gp">
- <i class="fcdo fcdo-google-plus" aria-hidden="true"></i> 使用Google+账号登录 </a>
- </p>
- </div>
- </div>
-
- <div class="modal__sidebar">
- <div class="modal__spacer">
- <div class="h2 pad-t">为什么要注册？</div>
- <ul class="checklist">
- <li>这是免费的！</li>
- <li>创建您自己的单词列表</li>
- <li>创建小测试</li>
- <li>保存收藏夹</li>
- <li>和朋友们分享</li>
- <li>个性化您的"我的词典"</li>
- </ul>
- </div>
-
- </div>
- <span class="modal__close js-toggle" data-target-selector="#modal-login">
- <i class="fcdo fcdo-close"></i>
- </span>
-
-</div>
-<div class="cdo-promo">
+ <div class="cdo-promo">
<div class="contain">
<div class="cols">
- <div class="cols__col spr-b spr--promo-search">
- <a href="https://dictionary.cambridge.org/zhs/toolbardictionary.html" title="从您的浏览器搜索">
- <span class="h4">从您的浏览器搜索</span>
- <p>只需要点击一下就可以将剑桥词典添加到您的浏览器！</p>
- </a>
- </div>
-
- <div class="cols__col spr-b spr--promo-widget">
+ <div class="cols__col spr-b spr--promo-widget">
<a href="https://dictionary.cambridge.org/zhs/freesearch.html" title="获得我们的免费小工具">
<span class="h4">获得我们的免费小工具</span>
<p>使用我们的免费搜索框部件来添加剑桥词典到您的网站。</p>
@@ -1966,6 +1956,12 @@ <h2 class="h3 txt-block txt-block--alt round-top flush">
</div>
</div>
</div>
+
+<script>
+ var gigyaAuthEnabled = true;
+ var thresholdPublic = 5;
+</script>
+
<footer id="footer" class="ftr clr">
<div class="contain">
<div class="ftr__nav">
@@ -2015,13 +2011,13 @@ <h2 class="h3 txt-block txt-block--alt round-top flush">
</a>
<a href="https://twitter.com/CambridgeWords" class="btnfeat btnfeat--tw" rel="external" target="_blank" title="关注我们！">
<i class="fcdo fcdo-twitter" aria-hidden="true"></i>
- <span>161 k</span>
+ <span>173 k</span>
<em>关注</em>
<span class="point"></span>
</a>
- <a href="https://plus.google.com/b/108790671280639180398" class="btnfeat btnfeat--gp" rel="external" target="_blank" title="分享我们！">
+ <a href="https://plus.google.com/+cambridgedictionary" class="btnfeat btnfeat--gp" rel="external" target="_blank" title="分享我们！">
<i class="fcdo fcdo-google-plus" aria-hidden="true"></i>
- <span>13.2 k</span>
+ <span>15.3 k</span>
<em>粉丝</em>
<span class="point"></span>
</a>
@@ -2032,8 +2028,6 @@ <h2 class="h3 txt-block txt-block--alt round-top flush">
</div>
</div>
</footer>
-
-
<div class="overlay js-overlay"></div>
<ul class="unstyled notification banner"></ul>
@@ -2073,15 +2067,14 @@ <h2 class="h3 txt-block txt-block--alt round-top flush">
&noscript=1"/>
</noscript>
<!-- End Facebook Pixel Code -->
- <script type="text/javascript" src="/zhs/notification/notifications.js?version=3.1.126&url=%2Fdictionary%2Fenglish-chinese-traditional%2Fcatch"></script>
- <script type="text/javascript" src="/zhs/common.js?version=3.1.126"></script>
+ <script>var NOTIFICATION_COOKIE = "notifications";var notifications = [];</script>
+ <script type="text/javascript" src="/zhs/common.js?version=4.0.64"></script>
<script type='text/javascript'>
var aBk = true;
</script>
-<script type='text/javascript' src="/zhs/ads.min.js?version=3.1.126" ></script>
-
+<script type='text/javascript' src="/zhs/external/scripts/ads.min.js?version=4.0.64" ></script>
<script type='text/javascript'>
ga('send','event','aBk','aBk',''+aBk,{'nonInteraction':1});
@@ -2124,5 +2117,6 @@ <h2 class="h3 txt-block txt-block--alt round-top flush">
}
})();
</script>
- </body>
+ <script type="text/javascript" async="async" src="https://cdns.eu1.gigya.com/js/gigya.js?apiKey=3_1Rly-IzDTFvKO75hiQQbkpInsqcVx6RBnqVUozkm1OVH_QRzS-xI3Cwj7qq7hWv5"></script>
+ </body>
</html>
diff --git a/test/specs/components/dictionaries/cambridge/response/house-zhs.html b/test/specs/components/dictionaries/cambridge/response/house-zhs.html
index 8c75e1204..29b7dd9aa 100644
--- a/test/specs/components/dictionaries/cambridge/response/house-zhs.html
+++ b/test/specs/components/dictionaries/cambridge/response/house-zhs.html
@@ -13,10 +13,12 @@
+
+
+
<link rel="canonical" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%AE%80%E4%BD%93/house" />
<meta property="og:url" content="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%AE%80%E4%BD%93/house" />
-
<link rel="alternate" hreflang="en" href="https://dictionary.cambridge.org/dictionary/english-chinese-simplified/house"/>
<link rel="alternate" hreflang="en-US" href="https://dictionary.cambridge.org/us/dictionary/english-chinese-simplified/house"/>
<link rel="alternate" hreflang="en-MX" href="https://dictionary.cambridge.org/us/dictionary/english-chinese-simplified/house"/>
@@ -25,6 +27,7 @@
<link rel="alternate" hreflang="en-CO" href="https://dictionary.cambridge.org/us/dictionary/english-chinese-simplified/house"/>
<link rel="alternate" hreflang="es" href="https://dictionary.cambridge.org/es/diccionario/ingles-chino-simplificado/house"/>
<link rel="alternate" hreflang="es-ES" href="https://dictionary.cambridge.org/es/diccionario/ingles-chino-simplificado/house"/>
+ <link rel="alternate" hreflang="es-419" href="https://dictionary.cambridge.org/es-LA/dictionary/english-chinese-simplified/house"/>
<link rel="alternate" hreflang="ru" href="https://dictionary.cambridge.org/ru/%D1%81%D0%BB%D0%BE%D0%B2%D0%B0%D1%80%D1%8C/%D0%B0%D0%BD%D0%B3%D0%BB%D0%BE-%D0%BA%D0%B8%D1%82%D0%B0%D0%B9%D1%81%D0%BA%D0%B8%D0%B9-%D1%83%D0%BF%D1%80%D0%BE%D1%89%D0%B5%D0%BD%D0%BD%D1%8B%D0%B9/house"/>
<link rel="alternate" hreflang="pt" href="https://dictionary.cambridge.org/pt/dicionario/ingles-chin%C3%AAs-simplificado/house"/>
<link rel="alternate" hreflang="pt-BR" href="https://dictionary.cambridge.org/pt/dicionario/ingles-chin%C3%AAs-simplificado/house"/>
@@ -33,39 +36,38 @@
<link rel="alternate" hreflang="it" href="https://dictionary.cambridge.org/it/dizionario/inglese-cinese-semplificato/house"/>
<link rel="alternate" hreflang="zh-Hans" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%AE%80%E4%BD%93/house"/>
<link rel="alternate" hreflang="zh-Hant" href="https://dictionary.cambridge.org/zht/%E8%A9%9E%E5%85%B8/%E8%8B%B1%E8%AA%9E-%E6%BC%A2%E8%AA%9E-%E7%B0%A1%E9%AB%94/house"/>
+ <link rel="alternate" hreflang="pl" href="https://dictionary.cambridge.org/pl/dictionary/english-chinese-simplified/house"/>
<link rel="alternate" hreflang="ko" href="https://dictionary.cambridge.org/ko/%EC%82%AC%EC%A0%84/%EC%98%81%EC%96%B4-%EC%A4%91%EA%B5%AD%EC%96%B4-%EA%B0%84%EC%B2%B4/house"/>
<link rel="alternate" hreflang="tr" href="https://dictionary.cambridge.org/tr/s%C3%B6zl%C3%BCk/ingilizce-basitle%C5%9Ftirilmi%C5%9F-%C3%A7ince/house"/>
<link rel="alternate" hreflang="ja" href="https://dictionary.cambridge.org/ja/dictionary/english-chinese-simplified/house"/>
<link rel="alternate" hreflang="vi" href="https://dictionary.cambridge.org/vi/dictionary/english-chinese-simplified/house"/>
- <link rel="amphtml" href="https://dictionary.cambridge.org/zhs/amp/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%AE%80%E4%BD%93/house" />
+ <link rel="amphtml" href="https://dictionary.cambridge.org/zhs/amp/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%AE%80%E4%BD%93/house" />
- <link href="https://dictionary.cambridge.org/zhs/gadgets/%E8%8B%B1%E5%BC%8F%E8%8B%B1%E8%AF%AD/opensearch.xml" title="剑桥在线词典" type="application/opensearchdescription+xml" rel="search"/>
- <meta name="google-site-verification" content="lg0qcRkaLtMeKJcXsOLoptzK-2MIRJzuEtiYHZf_O2Y" />
+ <meta name="google-site-verification" content="lg0qcRkaLtMeKJcXsOLoptzK-2MIRJzuEtiYHZf_O2Y" />
- <link href="/zhs/common.css?version=3.1.126" rel="stylesheet" type="text/css" />
+ <link href="/zhs/common.css?version=4.0.64" rel="stylesheet" type="text/css" />
- <noscript>
- <style>
- .nojs-hide { display: none; }
- </style>
- </noscript>
+ <noscript>
+ <style>
+ .nojs-hide { display: none; }
+ </style>
+ </noscript>
- <link rel="shortcut icon" type="image/x-icon" href="/zhs/external/images/favicon.ico?version=3.1.126"/>
- <link rel="apple-touch-icon-precomposed" type="image/x-icon" href="/zhs/external/images/apple-touch-icon-precomposed.png?version=3.1.126"/>
- <script>
- var dictDefaultList = "english-chinese-simplified;english-chinese-traditional;english;british-grammar";var isAuthenticated = false;
- </script>
- <script type="text/javascript">
- var adsArray = new Array();
- var pageDictCode = "english-chinese-simplified";
+ <link rel="shortcut icon" type="image/x-icon" href="/zhs/external/images/favicon.ico?version=4.0.64"/>
+ <link rel="apple-touch-icon-precomposed" type="image/x-icon" href="/zhs/external/images/apple-touch-icon-precomposed.png?version=4.0.64"/>
+
+ <script>var dictDefaultList = "english-chinese-simplified;english-chinese-traditional;english;british-grammar";var isAuthenticated = false;</script>
+ <script type="text/javascript">
+ var adsArray = new Array();
+ var pageDictCode = "english-chinese-simplified";
- // Remove hash from SocialAuth
- var link = window.location.href;
- if ("replaceState" in history && (/#$/.test(link) || /#_=_$/.test(link))) {
- history.replaceState("", document.title, window.location.pathname + window.location.search);
- }
- </script>
+ // Remove hash from SocialAuth
+ var link = window.location.href;
+ if ("replaceState" in history && (/#$/.test(link) || /#_=_$/.test(link))) {
+ history.replaceState("", document.title, window.location.pathname + window.location.search);
+ }
+ </script>
<script type='text/javascript'>
function readCookie(name) {
@@ -85,140 +87,224 @@
var pl_p = readCookie("pl_p");
</script>
- <script type='text/javascript'>
+
+
+ <script type='text/javascript'>
var pbHdSlots = [
- {code: 'ad_topslot_b', sizes: [728, 90],
- bids: [{ bidder: 'appnexus', params: { placementId: '11654157' }},
+ {code: 'ad_topslot_b', mediaTypes: { banner: { sizes: [728, 90] } },
+ bids: [{ bidder: 'rubicon', params: { accountId: '17282', siteId: '162036', zoneId: '776160' }},
+ { bidder: 'appnexus', params: { placementId: '11654157' }},
+ { bidder: 'ix', params: { siteId: '195466', size: [728, 90] }},
+ { bidder: 'openx', params: { unit: '539971080', delDomain: 'idm-d.openx.net' }},
{ bidder: 'sovrn', params: { tagid: '346693' }},
- { bidder: 'indexExchange', params: { id: '17', siteID: '195466' }},
- { bidder: 'rubicon', params: { accountId: '17282', siteId: '162036', zoneId: '776160' }},
{ bidder: 'aol', params: { placement: '6479710', network: '4832.1', server: 'adserver.adtech.de' }},
{ bidder: 'pulsepoint', params: { cf: '728X90', cp: '561262', ct: '602806' }}]},
- {code: 'ad_leftslot', sizes: [160, 600],
- bids: [{ bidder: 'appnexus', params: { placementId: '11654149' }},
+ {code: 'ad_leftslot', mediaTypes: { banner: { sizes: [160, 600] } },
+ bids: [{ bidder: 'rubicon', params: { accountId: '17282', siteId: '162036', zoneId: '776140' }},
+ { bidder: 'appnexus', params: { placementId: '11654149' }},
+ { bidder: 'ix', params: { siteId: '195464', size: [160, 600] }},
+ { bidder: 'openx', params: { unit: '539971066', delDomain: 'idm-d.openx.net' }},
{ bidder: 'sovrn', params: { tagid: '346698' }},
- { bidder: 'indexExchange', params: { id: '3', siteID: '195464' }},
- { bidder: 'rubicon', params: { accountId: '17282', siteId: '162036', zoneId: '776140' }},
{ bidder: 'aol', params: { placement: '6479703', network: '4832.1', server: 'adserver.adtech.de' }},
{ bidder: 'pulsepoint', params: { cf: '160X600', cp: '561262', ct: '602779' }}]},
- {code: 'ad_btmslot_a', sizes: [300, 250],
- bids: [{ bidder: 'appnexus', params: { placementId: '11653860' }},
+ {code: 'ad_btmslot_a', mediaTypes: { banner: { sizes: [[300, 250]] } },
+ bids: [{ bidder: 'rubicon', params: { accountId: '17282', siteId: '162036', zoneId: '776130' }},
+ { bidder: 'appnexus', params: { placementId: '11653860' }},
+ { bidder: 'ix', params: { siteId: '194852', size: [300, 250] }},
+ { bidder: 'openx', params: { unit: '539971063', delDomain: 'idm-d.openx.net' }},
{ bidder: 'sovrn', params: { tagid: '346688' }},
- { bidder: 'indexExchange', params: { id: '1', siteID: '194852' }},
- { bidder: 'rubicon', params: { accountId: '17282', siteId: '162036', zoneId: '776130' }},
{ bidder: 'aol', params: { placement: '6479718', network: '4832.1', server: 'adserver.adtech.de' }},
{ bidder: 'pulsepoint', params: { cf: '300X250', cp: '561262', ct: '602775' }}]},
- {code: 'ad_rightslot', sizes: [300, 250],
- bids: [{ bidder: 'appnexus', params: { placementId: '11654156' }},
+ {code: 'ad_rightslot', mediaTypes: { banner: { sizes: [300, 250] } },
+ bids: [{ bidder: 'rubicon', params: { accountId: '17282', siteId: '162036', zoneId: '776156' }},
+ { bidder: 'appnexus', params: { placementId: '11654156' }},
+ { bidder: 'ix', params: { siteId: '195465', size: [300, 250] }},
+ { bidder: 'openx', params: { unit: '539971079', delDomain: 'idm-d.openx.net' }},
{ bidder: 'sovrn', params: { tagid: '387232' }},
- { bidder: 'indexExchange', params: { id: '16', siteID: '195465' }},
- { bidder: 'rubicon', params: { accountId: '17282', siteId: '162036', zoneId: '776156' }},
{ bidder: 'aol', params: { placement: '6479700', network: '4832.1', server: 'adserver.adtech.de' }},
{ bidder: 'pulsepoint', params: { cf: '300X250', cp: '561262', ct: '602805' }}]},
- {code: 'ad_contentslot_1', sizes: [300, 250],
- bids: [{ bidder: 'appnexus', params: { placementId: '11654150' }},
+ {code: 'ad_contentslot_1', mediaTypes: { banner: { sizes: [[300, 250], [336, 280]] } },
+ bids: [{ bidder: 'rubicon', params: { accountId: '17282', siteId: '162036', zoneId: '776142' }},
+ { bidder: 'appnexus', params: { placementId: '11654150' }},
+ { bidder: 'ix', params: { siteId: '195452', size: [300, 250] }},
+ { bidder: 'ix', params: { siteId: '195452', size: [336, 280] }},
+ { bidder: 'openx', params: { unit: '539971067', delDomain: 'idm-d.openx.net' }},
{ bidder: 'sovrn', params: { tagid: '446383' }},
- { bidder: 'indexExchange', params: { id: '4', siteID: '195452' }},
- { bidder: 'rubicon', params: { accountId: '17282', siteId: '162036', zoneId: '776142' }},
{ bidder: 'aol', params: { placement: '6479707', network: '4832.1', server: 'adserver.adtech.de' }},
- { bidder: 'pulsepoint', params: { cf: '300X250', cp: '561262', ct: '602780' }}]}];
+ { bidder: 'aol', params: { placement: '6623862', network: '4832.1', server: 'adserver.adtech.de' }},
+ { bidder: 'pulsepoint', params: { cf: '300X250', cp: '561262', ct: '602780' }},
+ { bidder: 'pulsepoint', params: { cf: '336X280', cp: '561262', ct: '661201' }}]},
+ {code: 'ad_contentslot_2', mediaTypes: { banner: { sizes: [[300, 250], [336, 280]] } },
+ bids: [{ bidder: 'rubicon', params: { accountId: '17282', siteId: '162036', zoneId: '776144' }},
+ { bidder: 'appnexus', params: { placementId: '11654151' }},
+ { bidder: 'ix', params: { siteId: '195454', size: [300, 250] }},
+ { bidder: 'ix', params: { siteId: '195454', size: [336, 280] }},
+ { bidder: 'openx', params: { unit: '539971069', delDomain: 'idm-d.openx.net' }},
+ { bidder: 'sovrn', params: { tagid: '448834' }},
+ { bidder: 'aol', params: { placement: '6479711', network: '4832.1', server: 'adserver.adtech.de' }},
+ { bidder: 'aol', params: { placement: '6623860', network: '4832.1', server: 'adserver.adtech.de' }},
+ { bidder: 'pulsepoint', params: { cf: '300X250', cp: '561262', ct: '602784' }},
+ { bidder: 'pulsepoint', params: { cf: '336X280', cp: '561262', ct: '661202' }}]}];
var pbDesktopSlots = [
- {code: 'ad_topslot_b', sizes: [728, 90],
- bids: [{ bidder: 'appnexus', params: { placementId: '11654157' }},
+ {code: 'ad_topslot_b', mediaTypes: { banner: { sizes: [728, 90] } },
+ bids: [{ bidder: 'rubicon', params: { accountId: '17282', siteId: '162036', zoneId: '776160' }},
+ { bidder: 'appnexus', params: { placementId: '11654157' }},
+ { bidder: 'ix', params: { siteId: '195466', size: [728, 90] }},
+ { bidder: 'openx', params: { unit: '539971080', delDomain: 'idm-d.openx.net' }},
{ bidder: 'sovrn', params: { tagid: '346693' }},
- { bidder: 'indexExchange', params: { id: '17', siteID: '195466' }},
- { bidder: 'rubicon', params: { accountId: '17282', siteId: '162036', zoneId: '776160' }},
{ bidder: 'aol', params: { placement: '6479710', network: '4832.1', server: 'adserver.adtech.de' }},
{ bidder: 'pulsepoint', params: { cf: '728X90', cp: '561262', ct: '602806' }}]},
- {code: 'ad_leftslot', sizes: [160, 600],
- bids: [{ bidder: 'appnexus', params: { placementId: '11654149' }},
+ {code: 'ad_leftslot', mediaTypes: { banner: { sizes: [160, 600] } },
+ bids: [{ bidder: 'rubicon', params: { accountId: '17282', siteId: '162036', zoneId: '776140' }},
+ { bidder: 'appnexus', params: { placementId: '11654149' }},
+ { bidder: 'ix', params: { siteId: '195464', size: [160, 600] }},
+ { bidder: 'openx', params: { unit: '539971066', delDomain: 'idm-d.openx.net' }},
{ bidder: 'sovrn', params: { tagid: '346698' }},
- { bidder: 'indexExchange', params: { id: '3', siteID: '195464' }},
- { bidder: 'rubicon', params: { accountId: '17282', siteId: '162036', zoneId: '776140' }},
{ bidder: 'aol', params: { placement: '6479703', network: '4832.1', server: 'adserver.adtech.de' }},
{ bidder: 'pulsepoint', params: { cf: '160X600', cp: '561262', ct: '602779' }}]},
- {code: 'ad_btmslot_a', sizes: [300, 250],
- bids: [{ bidder: 'appnexus', params: { placementId: '11653860' }},
+ {code: 'ad_btmslot_a', mediaTypes: { banner: { sizes: [[300, 250]] } },
+ bids: [{ bidder: 'rubicon', params: { accountId: '17282', siteId: '162036', zoneId: '776130' }},
+ { bidder: 'appnexus', params: { placementId: '11653860' }},
+ { bidder: 'ix', params: { siteId: '194852', size: [300, 250] }},
+ { bidder: 'openx', params: { unit: '539971063', delDomain: 'idm-d.openx.net' }},
{ bidder: 'sovrn', params: { tagid: '346688' }},
- { bidder: 'indexExchange', params: { id: '1', siteID: '194852' }},
- { bidder: 'rubicon', params: { accountId: '17282', siteId: '162036', zoneId: '776130' }},
{ bidder: 'aol', params: { placement: '6479718', network: '4832.1', server: 'adserver.adtech.de' }},
{ bidder: 'pulsepoint', params: { cf: '300X250', cp: '561262', ct: '602775' }}]},
- {code: 'ad_rightslot', sizes: [300, 250],
- bids: [{ bidder: 'appnexus', params: { placementId: '11654156' }},
+ {code: 'ad_rightslot', mediaTypes: { banner: { sizes: [300, 250] } },
+ bids: [{ bidder: 'rubicon', params: { accountId: '17282', siteId: '162036', zoneId: '776156' }},
+ { bidder: 'appnexus', params: { placementId: '11654156' }},
+ { bidder: 'ix', params: { siteId: '195465', size: [300, 250] }},
+ { bidder: 'openx', params: { unit: '539971079', delDomain: 'idm-d.openx.net' }},
{ bidder: 'sovrn', params: { tagid: '387232' }},
- { bidder: 'indexExchange', params: { id: '16', siteID: '195465' }},
- { bidder: 'rubicon', params: { accountId: '17282', siteId: '162036', zoneId: '776156' }},
{ bidder: 'aol', params: { placement: '6479700', network: '4832.1', server: 'adserver.adtech.de' }},
{ bidder: 'pulsepoint', params: { cf: '300X250', cp: '561262', ct: '602805' }}]},
- {code: 'ad_contentslot_1', sizes: [300, 250],
- bids: [{ bidder: 'appnexus', params: { placementId: '11654150' }},
+ {code: 'ad_contentslot_1', mediaTypes: { banner: { sizes: [[300, 250], [336, 280]] } },
+ bids: [{ bidder: 'rubicon', params: { accountId: '17282', siteId: '162036', zoneId: '776142' }},
+ { bidder: 'appnexus', params: { placementId: '11654150' }},
+ { bidder: 'ix', params: { siteId: '195452', size: [300, 250] }},
+ { bidder: 'ix', params: { siteId: '195452', size: [336, 280] }},
+ { bidder: 'openx', params: { unit: '539971067', delDomain: 'idm-d.openx.net' }},
{ bidder: 'sovrn', params: { tagid: '446383' }},
- { bidder: 'indexExchange', params: { id: '4', siteID: '195452' }},
- { bidder: 'rubicon', params: { accountId: '17282', siteId: '162036', zoneId: '776142' }},
{ bidder: 'aol', params: { placement: '6479707', network: '4832.1', server: 'adserver.adtech.de' }},
- { bidder: 'pulsepoint', params: { cf: '300X250', cp: '561262', ct: '602780' }}]}];
+ { bidder: 'aol', params: { placement: '6623862', network: '4832.1', server: 'adserver.adtech.de' }},
+ { bidder: 'pulsepoint', params: { cf: '300X250', cp: '561262', ct: '602780' }},
+ { bidder: 'pulsepoint', params: { cf: '336X280', cp: '561262', ct: '661201' }}]},
+ {code: 'ad_contentslot_2', mediaTypes: { banner: { sizes: [[300, 250], [336, 280]] } },
+ bids: [{ bidder: 'rubicon', params: { accountId: '17282', siteId: '162036', zoneId: '776144' }},
+ { bidder: 'appnexus', params: { placementId: '11654151' }},
+ { bidder: 'ix', params: { siteId: '195454', size: [300, 250] }},
+ { bidder: 'ix', params: { siteId: '195454', size: [336, 280] }},
+ { bidder: 'openx', params: { unit: '539971069', delDomain: 'idm-d.openx.net' }},
+ { bidder: 'sovrn', params: { tagid: '448834' }},
+ { bidder: 'aol', params: { placement: '6479711', network: '4832.1', server: 'adserver.adtech.de' }},
+ { bidder: 'aol', params: { placement: '6623860', network: '4832.1', server: 'adserver.adtech.de' }},
+ { bidder: 'pulsepoint', params: { cf: '300X250', cp: '561262', ct: '602784' }},
+ { bidder: 'pulsepoint', params: { cf: '336X280', cp: '561262', ct: '661202' }}]}];
var pbTabletSlots = [
- {code: 'ad_topslot_b', sizes: [728, 90],
- bids: [{ bidder: 'appnexus', params: { placementId: '11654157' }},
+ {code: 'ad_topslot_b', mediaTypes: { banner: { sizes: [728, 90] } },
+ bids: [{ bidder: 'rubicon', params: { accountId: '17282', siteId: '162036', zoneId: '776160' }},
+ { bidder: 'appnexus', params: { placementId: '11654157' }},
+ { bidder: 'ix', params: { siteId: '195466', size: [728, 90] }},
+ { bidder: 'openx', params: { unit: '539971080', delDomain: 'idm-d.openx.net' }},
{ bidder: 'sovrn', params: { tagid: '346693' }},
- { bidder: 'indexExchange', params: { id: '17', siteID: '195466' }},
- { bidder: 'rubicon', params: { accountId: '17282', siteId: '162036', zoneId: '776160' }},
{ bidder: 'aol', params: { placement: '6479710', network: '4832.1', server: 'adserver.adtech.de' }},
{ bidder: 'pulsepoint', params: { cf: '728X90', cp: '561262', ct: '602806' }}]},
- {code: 'ad_btmslot_a', sizes: [300, 250],
- bids: [{ bidder: 'appnexus', params: { placementId: '11653860' }},
+ {code: 'ad_btmslot_a', mediaTypes: { banner: { sizes: [[300, 250]] } },
+ bids: [{ bidder: 'rubicon', params: { accountId: '17282', siteId: '162036', zoneId: '776130' }},
+ { bidder: 'appnexus', params: { placementId: '11653860' }},
+ { bidder: 'ix', params: { siteId: '194852', size: [300, 250] }},
+ { bidder: 'openx', params: { unit: '539971063', delDomain: 'idm-d.openx.net' }},
{ bidder: 'sovrn', params: { tagid: '346688' }},
- { bidder: 'indexExchange', params: { id: '1', siteID: '194852' }},
- { bidder: 'rubicon', params: { accountId: '17282', siteId: '162036', zoneId: '776130' }},
{ bidder: 'aol', params: { placement: '6479718', network: '4832.1', server: 'adserver.adtech.de' }},
{ bidder: 'pulsepoint', params: { cf: '300X250', cp: '561262', ct: '602775' }}]},
- {code: 'ad_rightslot', sizes: [300, 250],
- bids: [{ bidder: 'appnexus', params: { placementId: '11654156' }},
+ {code: 'ad_rightslot', mediaTypes: { banner: { sizes: [300, 250] } },
+ bids: [{ bidder: 'rubicon', params: { accountId: '17282', siteId: '162036', zoneId: '776156' }},
+ { bidder: 'appnexus', params: { placementId: '11654156' }},
+ { bidder: 'ix', params: { siteId: '195465', size: [300, 250] }},
+ { bidder: 'openx', params: { unit: '539971079', delDomain: 'idm-d.openx.net' }},
{ bidder: 'sovrn', params: { tagid: '387232' }},
- { bidder: 'indexExchange', params: { id: '16', siteID: '195465' }},
- { bidder: 'rubicon', params: { accountId: '17282', siteId: '162036', zoneId: '776156' }},
{ bidder: 'aol', params: { placement: '6479700', network: '4832.1', server: 'adserver.adtech.de' }},
{ bidder: 'pulsepoint', params: { cf: '300X250', cp: '561262', ct: '602805' }}]},
- {code: 'ad_contentslot_1', sizes: [300, 250],
- bids: [{ bidder: 'appnexus', params: { placementId: '11654150' }},
+ {code: 'ad_contentslot_1', mediaTypes: { banner: { sizes: [[300, 250], [336, 280]] } },
+ bids: [{ bidder: 'rubicon', params: { accountId: '17282', siteId: '162036', zoneId: '776142' }},
+ { bidder: 'appnexus', params: { placementId: '11654150' }},
+ { bidder: 'ix', params: { siteId: '195452', size: [300, 250] }},
+ { bidder: 'ix', params: { siteId: '195452', size: [336, 280] }},
+ { bidder: 'openx', params: { unit: '539971067', delDomain: 'idm-d.openx.net' }},
{ bidder: 'sovrn', params: { tagid: '446383' }},
- { bidder: 'indexExchange', params: { id: '4', siteID: '195452' }},
- { bidder: 'rubicon', params: { accountId: '17282', siteId: '162036', zoneId: '776142' }},
{ bidder: 'aol', params: { placement: '6479707', network: '4832.1', server: 'adserver.adtech.de' }},
- { bidder: 'pulsepoint', params: { cf: '300X250', cp: '561262', ct: '602780' }}]}];
+ { bidder: 'aol', params: { placement: '6623862', network: '4832.1', server: 'adserver.adtech.de' }},
+ { bidder: 'pulsepoint', params: { cf: '300X250', cp: '561262', ct: '602780' }},
+ { bidder: 'pulsepoint', params: { cf: '336X280', cp: '561262', ct: '661201' }}]},
+ {code: 'ad_contentslot_2', mediaTypes: { banner: { sizes: [[300, 250], [336, 280]] } },
+ bids: [{ bidder: 'rubicon', params: { accountId: '17282', siteId: '162036', zoneId: '776144' }},
+ { bidder: 'appnexus', params: { placementId: '11654151' }},
+ { bidder: 'ix', params: { siteId: '195454', size: [300, 250] }},
+ { bidder: 'ix', params: { siteId: '195454', size: [336, 280] }},
+ { bidder: 'openx', params: { unit: '539971069', delDomain: 'idm-d.openx.net' }},
+ { bidder: 'sovrn', params: { tagid: '448834' }},
+ { bidder: 'aol', params: { placement: '6479711', network: '4832.1', server: 'adserver.adtech.de' }},
+ { bidder: 'aol', params: { placement: '6623860', network: '4832.1', server: 'adserver.adtech.de' }},
+ { bidder: 'pulsepoint', params: { cf: '300X250', cp: '561262', ct: '602784' }},
+ { bidder: 'pulsepoint', params: { cf: '336X280', cp: '561262', ct: '661202' }}]}];
var pbMobileSlots = [
- {code: 'ad_topslot_a', sizes: [320, 50],
- bids: [{ bidder: 'appnexus', params: { placementId: '11654208' }},
+ {code: 'ad_topslot_a', mediaTypes: { banner: { sizes: [320, 50] } },
+ bids: [{ bidder: 'rubicon', params: { accountId: '17282', siteId: '162050', zoneId: '776358' }},
+ { bidder: 'appnexus', params: { placementId: '11654208' }},
+ { bidder: 'ix', params: { siteId: '195467', size: [320, 50] }},
+ { bidder: 'openx', params: { unit: '539971081', delDomain: 'idm-d.openx.net' }},
{ bidder: 'sovrn', params: { tagid: '387233' }},
- { bidder: 'indexExchange', params: { id: '18', siteID: '195467' }},
- { bidder: 'rubicon', params: { accountId: '17282', siteId: '162050', zoneId: '776358' }},
{ bidder: 'aol', params: { placement: '6479701', network: '4832.1', server: 'adserver.adtech.de' }},
{ bidder: 'pulsepoint', params: { cf: '300X250', cp: '561262', ct: '602807' }}]},
- {code: 'ad_btmslot_a', sizes: [[300, 250], [320, 50], [300, 50]],
- bids: [{ bidder: 'appnexus', params: { placementId: '11654174' }},
+ {code: 'ad_btmslot_a', mediaTypes: { banner: { sizes: [[300, 250], [320, 50], [300, 50]] } },
+ bids: [{ bidder: 'rubicon', params: { accountId: '17282', siteId: '162050', zoneId: '776336' }},
+ { bidder: 'appnexus', params: { placementId: '11654174' }},
+ { bidder: 'ix', params: { siteId: '195451', size: [300, 250] }},
+ { bidder: 'ix', params: { siteId: '195451', size: [320, 50] }},
+ { bidder: 'ix', params: { siteId: '195451', size: [300, 50] }},
+ { bidder: 'openx', params: { unit: '539971065', delDomain: 'idm-d.openx.net' }},
{ bidder: 'sovrn', params: { tagid: '446381' }},
{ bidder: 'sovrn', params: { tagid: '446382' }},
- { bidder: 'indexExchange', params: { id: '2', siteID: '195451' }},
- { bidder: 'rubicon', params: { accountId: '17282', siteId: '162050', zoneId: '776336' }},
{ bidder: 'aol', params: { placement: '6479709', network: '4832.1', server: 'adserver.adtech.de' }},
{ bidder: 'aol', params: { placement: '6479722', network: '4832.1', server: 'adserver.adtech.de' }},
{ bidder: 'aol', params: { placement: '6479720', network: '4832.1', server: 'adserver.adtech.de' }},
{ bidder: 'pulsepoint', params: { cf: '300X250', cp: '561262', ct: '602776' }},
{ bidder: 'pulsepoint', params: { cf: '300X50', cp: '561262', ct: '602777' }},
{ bidder: 'pulsepoint', params: { cf: '320X50', cp: '561262', ct: '602778' }}]},
- {code: 'ad_contentslot_1', sizes: [[300, 250], [320, 50], [300, 50]],
- bids: [{ bidder: 'appnexus', params: { placementId: '11654189' }},
+ {code: 'ad_contentslot_1', mediaTypes: { banner: { sizes: [[300, 250], [320, 100], [320, 50], [300, 50]] } },
+ bids: [{ bidder: 'rubicon', params: { accountId: '17282', siteId: '162050', zoneId: '776338' }},
+ { bidder: 'appnexus', params: { placementId: '11654189' }},
+ { bidder: 'ix', params: { siteId: '195453', size: [300, 250] }},
+ { bidder: 'ix', params: { siteId: '195453', size: [320, 100] }},
+ { bidder: 'ix', params: { siteId: '195453', size: [320, 50] }},
+ { bidder: 'ix', params: { siteId: '195453', size: [300, 50] }},
+ { bidder: 'openx', params: { unit: '539971068', delDomain: 'idm-d.openx.net' }},
{ bidder: 'sovrn', params: { tagid: '446385' }},
{ bidder: 'sovrn', params: { tagid: '446384' }},
- { bidder: 'indexExchange', params: { id: '5', siteID: '195453' }},
- { bidder: 'rubicon', params: { accountId: '17282', siteId: '162050', zoneId: '776338' }},
{ bidder: 'aol', params: { placement: '6479724', network: '4832.1', server: 'adserver.adtech.de' }},
{ bidder: 'aol', params: { placement: '6479694', network: '4832.1', server: 'adserver.adtech.de' }},
{ bidder: 'aol', params: { placement: '6479699', network: '4832.1', server: 'adserver.adtech.de' }},
{ bidder: 'pulsepoint', params: { cf: '300X250', cp: '561262', ct: '602781' }},
{ bidder: 'pulsepoint', params: { cf: '300X50', cp: '561262', ct: '602782' }},
- { bidder: 'pulsepoint', params: { cf: '320X50', cp: '561262', ct: '602783' }}]}];
+ { bidder: 'pulsepoint', params: { cf: '320X100', cp: '561262', ct: '661195' }},
+ { bidder: 'pulsepoint', params: { cf: '320X50', cp: '561262', ct: '602783' }}]},
+ {code: 'ad_contentslot_2', mediaTypes: { banner: { sizes: [[300, 250], [320, 100], [320, 50], [300, 50]] } },
+ bids: [{ bidder: 'rubicon', params: { accountId: '17282', siteId: '162050', zoneId: '776340' }},
+ { bidder: 'appnexus', params: { placementId: '11654192' }},
+ { bidder: 'ix', params: { siteId: '195455', size: [300, 250] }},
+ { bidder: 'ix', params: { siteId: '195455', size: [320, 100] }},
+ { bidder: 'ix', params: { siteId: '195455', size: [320, 50] }},
+ { bidder: 'ix', params: { siteId: '195455', size: [300, 50] }},
+ { bidder: 'openx', params: { unit: '539971070', delDomain: 'idm-d.openx.net' }},
+ { bidder: 'sovrn', params: { tagid: '448836' }},
+ { bidder: 'sovrn', params: { tagid: '448835' }},
+ { bidder: 'aol', params: { placement: '6479708', network: '4832.1', server: 'adserver.adtech.de' }},
+ { bidder: 'aol', params: { placement: '6479716', network: '4832.1', server: 'adserver.adtech.de' }},
+ { bidder: 'aol', params: { placement: '6479705', network: '4832.1', server: 'adserver.adtech.de' }},
+ { bidder: 'pulsepoint', params: { cf: '300X250', cp: '561262', ct: '602785' }},
+ { bidder: 'pulsepoint', params: { cf: '300X50', cp: '561262', ct: '602786' }},
+ { bidder: 'pulsepoint', params: { cf: '320X100', cp: '561262', ct: '661196' }},
+ { bidder: 'pulsepoint', params: { cf: '320X50', cp: '561262', ct: '602787' }}]}];
var pbjs = pbjs || {};
pbjs.que = pbjs.que || [];
@@ -245,14 +331,19 @@
'cap': true
}]
};
- pbjs.que.push(function() {
- pbjs.setConfig({
- priceGranularity: customGranularity,
- bidderSequence: "fixed"
- });
+ pbjsCfg = {
+ userSync: { syncsPerBidder: 50 },
+ priceGranularity: customGranularity,
+ maxRequestsPerOrigin: 1,
+ enableSendAllBids: false,
+ timeoutBuffer: 400,
+ bidderSequence: "fixed"
+ };
+ pbjs.que.push(function() {
+ pbjs.setConfig(pbjsCfg);
});
</script>
- <script type="text/javascript" src="/zhs/required.js?version=3.1.126"></script>
+ <script type="text/javascript" src="/zhs/required.js?version=4.0.64"></script>
<script type='text/javascript' async>
var pbAdUnits = getPrebidSlots(curResolution);
var googletag = googletag || {};
@@ -261,7 +352,6 @@
googletag.pubads().disableInitialLoad();
});
addPrebidAdUnits(pbAdUnits);
- setTimeout(sendPrebidServerRequest, PREBID_TIMEOUT);
var dfpSlots = {};
(function() {
@@ -280,17 +370,20 @@
dfpSlots['topslot_b'] = googletag.defineSlot('/2863368/topslot', [728, 90], 'ad_topslot_b').defineSizeMapping(mapping_topslot_b).setTargeting('vp', 'top').setTargeting('hp', 'center').setTargeting('ad_group', Adomik.randomAdGroup()).addService(googletag.pubads());
var mapping_leftslot = googletag.sizeMapping().addSize([963, 0], [160, 600]).addSize([0, 0], []).build();
dfpSlots['leftslot'] = googletag.defineSlot('/2863368/leftslot', [160, 600], 'ad_leftslot').defineSizeMapping(mapping_leftslot).setTargeting('vp', 'top').setTargeting('hp', 'left').setTargeting('ad_group', Adomik.randomAdGroup()).addService(googletag.pubads());
- var mapping_btmslot_a = googletag.sizeMapping().addSize([746, 0], [300, 250]).addSize([0, 0], [[300, 250], [320, 50], [300, 50]]).build();
- dfpSlots['btmslot_a'] = googletag.defineSlot('/2863368/btmslot', [300, 250], 'ad_btmslot_a').defineSizeMapping(mapping_btmslot_a).setTargeting('vp', 'btm').setTargeting('hp', 'center').setTargeting('ad_group', Adomik.randomAdGroup()).addService(googletag.pubads());
+ var mapping_btmslot_a = googletag.sizeMapping().addSize([746, 0], [[300, 250], 'fluid']).addSize([0, 0], [[300, 250], [320, 50], [300, 50], 'fluid']).build();
+ dfpSlots['btmslot_a'] = googletag.defineSlot('/2863368/btmslot', [[300, 250], 'fluid'], 'ad_btmslot_a').defineSizeMapping(mapping_btmslot_a).setTargeting('vp', 'btm').setTargeting('hp', 'center').setTargeting('ad_group', Adomik.randomAdGroup()).addService(googletag.pubads());
var mapping_houseslot_a = googletag.sizeMapping().addSize([963, 0], [300, 250]).addSize([0, 0], []).build();
dfpSlots['houseslot_a'] = googletag.defineSlot('/2863368/houseslot', [300, 250], 'ad_houseslot_a').defineSizeMapping(mapping_houseslot_a).setTargeting('vp', 'mid').setTargeting('hp', 'right').setTargeting('ad_group', Adomik.randomAdGroup()).addService(googletag.pubads());
var mapping_houseslot_b = googletag.sizeMapping().addSize([963, 0], []).addSize([0, 0], [300, 250]).build();
dfpSlots['houseslot_b'] = googletag.defineSlot('/2863368/houseslot', [], 'ad_houseslot_b').defineSizeMapping(mapping_houseslot_b).setTargeting('vp', 'btm').setTargeting('hp', 'center').setTargeting('ad_group', Adomik.randomAdGroup()).addService(googletag.pubads());
var mapping_rightslot = googletag.sizeMapping().addSize([746, 0], [300, 250]).addSize([0, 0], []).build();
dfpSlots['rightslot'] = googletag.defineSlot('/2863368/rightslot', [300, 250], 'ad_rightslot').defineSizeMapping(mapping_rightslot).setTargeting('vp', 'mid').setTargeting('hp', 'right').setTargeting('ad_group', Adomik.randomAdGroup()).addService(googletag.pubads());
- var mapping_contentslot = googletag.sizeMapping().addSize([746, 0], [300, 250]).addSize([0, 0], [[300, 250], [320, 50], [300, 50]]).build();
- dfpSlots['contentslot_1'] = googletag.defineSlot('/2863368/mpuslot', [300, 250], 'ad_contentslot_1').defineSizeMapping(mapping_contentslot).setTargeting('cdo_si', 1).setTargeting('vp', 'mid').setTargeting('hp', 'center').setTargeting('ad_group', Adomik.randomAdGroup()).addService(googletag.pubads());
+ var mapping_contentslot = googletag.sizeMapping().addSize([746, 0], [[300, 250], [336, 280], 'fluid']).addSize([0, 0], [[300, 250], [320, 100], [320, 50], [300, 50], 'fluid']).build();
+ dfpSlots['contentslot_1'] = googletag.defineSlot('/2863368/mpuslot', [[300, 250], [336, 280], 'fluid'], 'ad_contentslot_1').defineSizeMapping(mapping_contentslot).setTargeting('cdo_si', '1').setTargeting('vp', 'mid').setTargeting('hp', 'center').setTargeting('ad_group', Adomik.randomAdGroup()).addService(googletag.pubads());
+ dfpSlots['contentslot_2'] = googletag.defineSlot('/2863368/mpuslot', [[300, 250], [336, 280], 'fluid'], 'ad_contentslot_2').defineSizeMapping(mapping_contentslot).setTargeting('cdo_si', '2').setTargeting('vp', 'mid').setTargeting('hp', 'center').setTargeting('ad_group', Adomik.randomAdGroup()).addService(googletag.pubads());
googletag.pubads().addEventListener('slotRenderEnded', function(event) { if (!event.isEmpty && event.slot.renderCallback) { event.slot.renderCallback(event); } });
+
+ googletag.pubads().setTargeting('ad_h', Adomik.hour);
googletag.pubads().setTargeting("cdo_pc", "dictionary");
googletag.pubads().setTargeting("cdo_pt", "entry");
googletag.pubads().setTargeting("cdo_dc", "english-chinese-simplified");
@@ -303,6 +396,7 @@
googletag.pubads().setCategoryExclusion('lcp').setCategoryExclusion('resp').setCategoryExclusion('wprod');
+
googletag.pubads().enableSingleRequest();
googletag.pubads().collapseEmptyDivs(false);
googletag.enableServices();
@@ -311,12 +405,12 @@
<meta property="og:title" content="house汉语(简体)翻译：剑桥词典" />
<meta property="og:description" content="house翻译：家, 房屋，住宅, 住在一所房子里的人；全家人, 动物的笼舍, （有特定用途的）大楼，大厦, 公司, （尤指出版图书或设计服装的）公司，机构，商行, 音乐, 豪斯音乐，货仓音乐（电子乐器演奏的一种快节奏的流行音乐）, 学校里的小组, （学校里为进行比赛而分成的）组, 家庭, 家族；（尤指）皇室, 政治, 议会，议院, 辩论的发起方, 剧院, 观众，（尤指）剧院观众, 为…提供住处，收容；为…提供空间。了解更多。" />
- <meta property="og:image" content="/zhs/external/images/CDO_logo_120x120.jpg?version=3.1.126" />
+ <meta property="og:image" content="https://dictionary.cambridge.org/zhs/external/images/CDO_logo_120x120.jpg" />
</head>
<body class="default_layout">
<div itemscope itemtype="http://schema.org/Product" style="display: none;">
<span itemprop="name">house汉语(简体)翻译：剑桥词典</span>
- <a itemprop="image" href="/zhs/external/images/CDO_logo_120x120.jpg?version=3.1.126">剑桥词典logo</a>
+ <a itemprop="image" href="/zhs/external/images/CDO_logo_120x120.jpg?version=4.0.64">剑桥词典logo</a>
</div>
<div class="overlay js-nav-trig"></div>
@@ -379,38 +473,42 @@
<span class="pointer js-toggle-children" data-target-selector="next" title="更改语言方向"><i class="fcdo fcdo-exchange fcdo--nudge" aria-hidden="true"></i></span>
<span>
<a style="display: inline;" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%84%8F%E5%A4%A7%E5%88%A9%E8%AF%AD/" data-dictCode="english-italian" title="剑桥英语-意大利语词典">英语-意大利语</a>
- <a style="display: none;" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E6%84%8F%E5%A4%A7%E5%88%A9%E8%AF%AD-%E8%8B%B1%E8%AF%AD/" data-dictCode="italian-english" title="Italian-English Dictionary">Italian–English</a>
+ <a style="display: none;" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E6%84%8F%E5%A4%A7%E5%88%A9%E8%AF%AD-%E8%8B%B1%E8%AF%AD/" data-dictCode="italian-english" title="意大利语-英语词典">意大利语–英语</a>
</span>
</li>
<li>
<span class="pointer js-toggle-children" data-target-selector="next" title="更改语言方向"><i class="fcdo fcdo-exchange fcdo--nudge" aria-hidden="true"></i></span>
<span>
<a style="display: inline;" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B3%A2%E5%85%B0%E8%AF%AD/" data-dictCode="english-polish" title="剑桥英语-波兰语词典">英语-波兰语</a>
- <a style="display: none;" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E6%B3%A2%E5%85%B0%E8%AF%AD-%E8%8B%B1%E8%AF%AD/" data-dictCode="polish-english" title="Polish-English Dictionary">Polish–English</a>
+ <a style="display: none;" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E6%B3%A2%E5%85%B0%E8%AF%AD-%E8%8B%B1%E8%AF%AD/" data-dictCode="polish-english" title="波兰语-英语词典">波兰语–英语</a>
</span>
</li>
<li>
<span class="pointer js-toggle-children" data-target-selector="next" title="更改语言方向"><i class="fcdo fcdo-exchange fcdo--nudge" aria-hidden="true"></i></span>
<span>
<a style="display: inline;" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E8%91%A1%E8%90%84%E7%89%99%E8%AF%AD/" data-dictCode="english-portuguese" title="剑桥英语-葡萄牙语词典">英语-葡萄牙语</a>
- <a style="display: none;" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%91%A1%E8%90%84%E7%89%99%E8%AF%AD-%E8%8B%B1%E8%AF%AD/" data-dictCode="portuguese-english" title="Portuguese-English Dictionary">Portuguese–English</a>
+ <a style="display: none;" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%91%A1%E8%90%84%E7%89%99%E8%AF%AD-%E8%8B%B1%E8%AF%AD/" data-dictCode="portuguese-english" title="葡萄牙语-英语词典">葡萄牙语–英语</a>
</span>
</li>
<li>
<span class="pointer js-toggle-children" data-target-selector="next" title="更改语言方向"><i class="fcdo fcdo-exchange fcdo--nudge" aria-hidden="true"></i></span>
<span>
<a style="display: inline;" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%97%A5%E8%AF%AD/" data-dictCode="english-japanese" title="剑桥英语-日语词典">英语-日语</a>
- <a style="display: none;" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/japanese-english/" data-dictCode="japanese-english" title="Japanese-English Dictionary">Japanese–English</a>
+ <a style="display: none;" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/japanese-english/" data-dictCode="japanese-english" title="日语-英语词典">日语–英语</a>
</span>
</li>
<li class="off-canvas__nav__section"><strong>半双语</strong></li>
+ <li><a href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8D%B7%E5%85%B0%E8%AF%AD-%E8%8B%B1%E8%AF%AD/" title="荷兰语-英语词典">荷兰语-英语</a></li>
<li><a href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E9%98%BF%E6%8B%89%E4%BC%AF%E8%AF%AD/" title="剑桥英语-阿拉伯语词典">英语-阿拉伯语</a></li>
<li><a href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E5%8A%A0%E6%B3%B0%E7%BD%97%E5%B0%BC%E4%BA%9A%E8%AF%AD/" title="剑桥英语-加泰罗尼亚语词典">英语-加泰罗尼亚语</a></li>
<li><a href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%AE%80%E4%BD%93/" title="剑桥英语-汉语（简体）词典">英语-汉语（简体）</a></li>
<li><a href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%B9%81%E4%BD%93/" title="剑桥英语-汉语（繁体）词典">英语-汉语（繁体）</a></li>
+ <li><a href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%8D%B7%E5%85%8B%E8%AF%AD/" title="英语-捷克语词典">英语- 捷克语</a></li>
+ <li><a href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E4%B8%B9%E9%BA%A6%E8%AF%AD/" title="英语-丹麦语词典">英语- 丹麦语</a></li>
<li><a href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E9%9F%A9%E8%AF%AD/" title="剑桥英语-韩语词典">英语-韩语</a></li>
<li><a href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E9%A9%AC%E6%9D%A5%E8%A5%BF%E4%BA%9A%E8%AF%AD/" title="英语-马来语词典">英语-马来语</a></li>
+ <li><a href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%8C%AA%E5%A8%81%E8%AF%AD/" title="英语-挪威语词典">英语-挪威语</a></li>
<li><a href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E4%BF%84%E8%AF%AD/" title="剑桥英语-俄语词典">英语-俄语</a></li>
<li><a href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B3%B0%E8%AF%AD/" title="英语-泰语词典">英语-泰语</a></li>
<li><a href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E5%9C%9F%E8%80%B3%E5%85%B6%E8%AF%AD/" title="英语-土耳其语词典">英语-土耳其语</a></li>
@@ -430,7 +528,7 @@
<div class="off-canvas__pad">
<p>
- <a class="btn btn--impact btn--bold js-toggle" data-target-selector="#modal-login">
+ <a class="btn btn--impact btn--bold loginBtn btn--forbidden">
<i class="fcdo fcdo-user" aria-hidden="true"></i> 登录 </a>
</p>
<div class="off-canvas__dropdown">
@@ -443,13 +541,15 @@
<li><a href="/dictionary/english-chinese-simplified/house" hreflang="en">English (UK)</a>
<li><a href="/us/dictionary/english-chinese-simplified/house" hreflang="en-US">English (US)</a>
<li><a href="/es/diccionario/ingles-chino-simplificado/house" hreflang="es">Español</a>
+ <li><a href="/es-LA/dictionary/english-chinese-simplified/house" hreflang="es-419">Español (Latinoamérica)</a>
<li><a href="/ru/%D1%81%D0%BB%D0%BE%D0%B2%D0%B0%D1%80%D1%8C/%D0%B0%D0%BD%D0%B3%D0%BB%D0%BE-%D0%BA%D0%B8%D1%82%D0%B0%D0%B9%D1%81%D0%BA%D0%B8%D0%B9-%D1%83%D0%BF%D1%80%D0%BE%D1%89%D0%B5%D0%BD%D0%BD%D1%8B%D0%B9/house" hreflang="ru">Русский</a>
<li><a href="/pt/dicionario/ingles-chin%C3%AAs-simplificado/house" hreflang="pt">Português</a>
<li><a href="/de/worterbuch/englisch-chinesisch-vereinfacht/house" hreflang="de">Deutsch</a>
<li><a href="/fr/dictionnaire/anglais-chinois-simplifie/house" hreflang="fr">Français</a>
<li><a href="/it/dizionario/inglese-cinese-semplificato/house" hreflang="it">Italiano</a>
<li><a href="/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%AE%80%E4%BD%93/house" hreflang="zh-Hans">中文 (简体)</a>
- <li><a href="/zht/%E8%A9%9E%E5%85%B8/%E8%8B%B1%E8%AA%9E-%E6%BC%A2%E8%AA%9E-%E7%B0%A1%E9%AB%94/house" hreflang="zh-Hant">中文 (繁體)</a>
+ <li><a href="/zht/%E8%A9%9E%E5%85%B8/%E8%8B%B1%E8%AA%9E-%E6%BC%A2%E8%AA%9E-%E7%B0%A1%E9%AB%94/house" hreflang="zh-Hant">正體中文 (繁體)</a>
+ <li><a href="/pl/dictionary/english-chinese-simplified/house" hreflang="pl">Polski</a>
<li><a href="/ko/%EC%82%AC%EC%A0%84/%EC%98%81%EC%96%B4-%EC%A4%91%EA%B5%AD%EC%96%B4-%EA%B0%84%EC%B2%B4/house" hreflang="ko">한국어</a>
<li><a href="/tr/s%C3%B6zl%C3%BCk/ingilizce-basitle%C5%9Ftirilmi%C5%9F-%C3%A7ince/house" hreflang="tr">Türkçe</a>
<li><a href="/ja/dictionary/english-chinese-simplified/house" hreflang="ja">日本語</a>
@@ -472,15 +572,15 @@
<li><b>关注我们</b></li>
<li><a href="https://www.facebook.com/home.php?#!/pages/Cambridge-Dictionaries-Online/118775618133878" title="赞" class="circle bg--fb" target="_blank"><i class="fcdo fcdo-facebook" aria-hidden="true"></i></a></li>
<li><a href="https://twitter.com/CambridgeWords" title="关注" class="circle bg--tw" target="_blank"><i class="fcdo fcdo-twitter" aria-hidden="true"></i></a></li>
- <li><a href="https://plus.google.com/b/108790671280639180398" title="粉丝" class="circle bg--gp" target="_blank"><i class="fcdo fcdo-google-plus" aria-hidden="true"></i></a></li>
+ <li><a href="https://plus.google.com/+cambridgedictionary" title="粉丝" class="circle bg--gp" target="_blank"><i class="fcdo fcdo-google-plus" aria-hidden="true"></i></a></li>
</ul>
</div>
<div class="cdo-hdr__profile">
<a class="hdr-btn ico-bg js-toggle" >
- <span class="btn btn--impact btn--bold js-toggle" data-target-selector="#modal-login">
- <i class="fcdo fcdo-user"></i>
- <span class="resp resp--lrg-i">登录</span>
- </span>
+ <span class="btn btn--impact btn--bold loginBtn btn--forbidden">
+ <i class="fcdo fcdo-user"></i>
+ <span class="resp resp--lrg-i">登录</span>
+ </span>
</a>
<div class="dropdown dropdown--pad-a dropdown--right">
@@ -494,13 +594,15 @@
<li><a href="/dictionary/english-chinese-simplified/house" hreflang="en">English (UK)</a></li>
<li><a href="/us/dictionary/english-chinese-simplified/house" hreflang="en-US">English (US)</a></li>
<li><a href="/es/diccionario/ingles-chino-simplificado/house" hreflang="es">Español</a></li>
+ <li><a href="/es-LA/dictionary/english-chinese-simplified/house" hreflang="es-419">Español (Latinoamérica)</a></li>
<li><a href="/ru/%D1%81%D0%BB%D0%BE%D0%B2%D0%B0%D1%80%D1%8C/%D0%B0%D0%BD%D0%B3%D0%BB%D0%BE-%D0%BA%D0%B8%D1%82%D0%B0%D0%B9%D1%81%D0%BA%D0%B8%D0%B9-%D1%83%D0%BF%D1%80%D0%BE%D1%89%D0%B5%D0%BD%D0%BD%D1%8B%D0%B9/house" hreflang="ru">Русский</a></li>
<li><a href="/pt/dicionario/ingles-chin%C3%AAs-simplificado/house" hreflang="pt">Português</a></li>
<li><a href="/de/worterbuch/englisch-chinesisch-vereinfacht/house" hreflang="de">Deutsch</a></li>
<li><a href="/fr/dictionnaire/anglais-chinois-simplifie/house" hreflang="fr">Français</a></li>
<li><a href="/it/dizionario/inglese-cinese-semplificato/house" hreflang="it">Italiano</a></li>
<li><a href="/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%AE%80%E4%BD%93/house" hreflang="zh-Hans">中文 (简体)</a></li>
- <li><a href="/zht/%E8%A9%9E%E5%85%B8/%E8%8B%B1%E8%AA%9E-%E6%BC%A2%E8%AA%9E-%E7%B0%A1%E9%AB%94/house" hreflang="zh-Hant">中文 (繁體)</a></li>
+ <li><a href="/zht/%E8%A9%9E%E5%85%B8/%E8%8B%B1%E8%AA%9E-%E6%BC%A2%E8%AA%9E-%E7%B0%A1%E9%AB%94/house" hreflang="zh-Hant">正體中文 (繁體)</a></li>
+ <li><a href="/pl/dictionary/english-chinese-simplified/house" hreflang="pl">Polski</a></li>
<li><a href="/ko/%EC%82%AC%EC%A0%84/%EC%98%81%EC%96%B4-%EC%A4%91%EA%B5%AD%EC%96%B4-%EA%B0%84%EC%B2%B4/house" hreflang="ko">한국어</a></li>
<li><a href="/tr/s%C3%B6zl%C3%BCk/ingilizce-basitle%C5%9Ftirilmi%C5%9F-%C3%A7ince/house" hreflang="tr">Türkçe</a></li>
<li><a href="/ja/dictionary/english-chinese-simplified/house" hreflang="ja">日本語</a></li>
@@ -606,40 +708,44 @@
<span class="bilingual-switch pointer js-toggle-children" data-target-selector="next" title="更改语言方向"><i class="fcdo fcdo-exchange fcdo--nudge" aria-hidden="true"></i></span>
<span>
<a style="display: inline;" href="#" data-dictCode="english-italian" title="剑桥英语-意大利语词典">英语-意大利语</a>
- <a style="display: none;" href="#" data-dictCode="italian-english" title="Italian-English Dictionary">Italian–English</a>
+ <a style="display: none;" href="#" data-dictCode="italian-english" title="意大利语-英语词典">意大利语–英语</a>
</span>
</li>
<li>
<span class="bilingual-switch pointer js-toggle-children" data-target-selector="next" title="更改语言方向"><i class="fcdo fcdo-exchange fcdo--nudge" aria-hidden="true"></i></span>
<span>
<a style="display: inline;" href="#" data-dictCode="english-polish" title="剑桥英语-波兰语词典">英语-波兰语</a>
- <a style="display: none;" href="#" data-dictCode="polish-english" title="Polish-English Dictionary">Polish–English</a>
+ <a style="display: none;" href="#" data-dictCode="polish-english" title="波兰语-英语词典">波兰语–英语</a>
</span>
</li>
<li>
<span class="bilingual-switch pointer js-toggle-children" data-target-selector="next" title="更改语言方向"><i class="fcdo fcdo-exchange fcdo--nudge" aria-hidden="true"></i></span>
<span>
<a style="display: inline;" href="#" data-dictCode="english-portuguese" title="剑桥英语-葡萄牙语词典">英语-葡萄牙语</a>
- <a style="display: none;" href="#" data-dictCode="portuguese-english" title="Portuguese-English Dictionary">Portuguese–English</a>
+ <a style="display: none;" href="#" data-dictCode="portuguese-english" title="葡萄牙语-英语词典">葡萄牙语–英语</a>
</span>
</li>
<li>
<span class="bilingual-switch pointer js-toggle-children" data-target-selector="next" title="更改语言方向"><i class="fcdo fcdo-exchange fcdo--nudge" aria-hidden="true"></i></span>
<span>
<a style="display: inline;" href="#" data-dictCode="english-japanese" title="剑桥英语-日语词典">英语-日语</a>
- <a style="display: none;" href="#" data-dictCode="japanese-english" title="Japanese-English Dictionary">Japanese–English</a>
+ <a style="display: none;" href="#" data-dictCode="japanese-english" title="日语-英语词典">日语–英语</a>
</span>
</li>
</ul>
<div class="h3">半双语词典</div>
<ul>
+ <li><a href="#" data-dictCode="dutch-english" title="荷兰语-英语词典">荷兰语-英语</a></li>
<li><a href="#" data-dictCode="english-arabic" title="剑桥英语-阿拉伯语词典">英语-阿拉伯语</a></li>
<li><a href="#" data-dictCode="english-catalan" title="剑桥英语-加泰罗尼亚语词典">英语-加泰罗尼亚语</a></li>
<li><a href="#" data-dictCode="english-chinese-simplified" title="剑桥英语-汉语（简体）词典">英语-汉语（简体）</a></li>
<li><a href="#" data-dictCode="english-chinese-traditional" title="剑桥英语-汉语（繁体）词典">英语-汉语（繁体）</a></li>
+ <li><a href="#" data-dictCode="english-czech" title="英语-捷克语词典">英语- 捷克语</a></li>
+ <li><a href="#" data-dictCode="english-danish" title="英语-丹麦语词典">英语- 丹麦语</a></li>
<li><a href="#" data-dictCode="english-korean" title="剑桥英语-韩语词典">英语-韩语</a></li>
<li><a href="#" data-dictCode="english-malaysian" title="英语-马来语词典">英语-马来语</a></li>
+ <li><a href="#" data-dictCode="english-norwegian" title="英语-挪威语词典">英语-挪威语</a></li>
<li><a href="#" data-dictCode="english-russian" title="剑桥英语-俄语词典">英语-俄语</a></li>
<li><a href="#" data-dictCode="english-thai" title="英语-泰语词典">英语-泰语</a></li>
<li><a href="#" data-dictCode="turkish" title="英语-土耳其语词典">英语-土耳其语</a></li>
@@ -658,6 +764,8 @@
</form> </div>
</header>
+ <div id="overlay"></div>
+
<div id='ad_topslot_a' class='am-default '>
<script type='text/javascript'>
@@ -736,6 +844,29 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -764,56 +895,45 @@
<div id="page-content" class="cdo-tpl__z cdo-tpl-main__z2 clrd" role="main">
<div id="entryContent" class="entrybox english-chinese-simplified entry-body" lang="en" itemscope itemtype="http://schema.org/WebPage">
<div itemprop="author" itemscope itemtype="http://schema.org/Organization">
- <meta itemprop="name" content='剑桥在线词典' />
- <meta itemprop="url" content="https://plus.google.com/108790671280639180398" />
- </div>
- <div itemprop="publisher" itemscope itemtype="http://schema.org/Organization">
- <meta itemprop="name" content="©剑桥大学出版社" />
- <meta itemprop="url" content="https://plus.google.com/112563436639321822653" />
+ <meta itemprop="name" content='Cambridge Dictionary' />
+ <meta itemprop="url" content="https://plus.google.com/+cambridgedictionary" />
</div>
<meta itemprop="headline" content="house翻译：家, 房屋，住宅, 住在一所房子里的人；全家人, 动物的笼舍, （有特定用途的）大楼，大厦, 公司, （尤指出版图书或设计服装的）公司，机构，商行, 音乐, 豪斯音乐，货仓音乐（电子乐器演奏的一种快节奏的流行音乐）, 学校里的小组, （学校里为进行比赛而分成的）组, 家庭, 家族；（尤指）皇室, 政治, 议会，议院, 辩论的发起方, 剧院, 观众，（尤指）剧院观众, 为…提供住处，收容；为…提供空间。了解更多。" />
- <meta itemprop="copyrightHolder" content="©剑桥大学出版社" />
+ <meta itemprop="copyrightHolder" content="© Cambridge University Press" />
<meta itemprop="copyrightYear" content="2018" />
<meta itemprop="inLanguage" content="zh" />
<div class="cdo-dblclick-area">
- <div class="di superentry" itemprop="text">
- <div class="di-head"><div class="di-title">
- <h1 class="hw" title="什么是“house”?">
- “house”在英语-汉语(简体)词典中的翻译
- </h1>
- </div>
+ <div class="di superentry" itemprop="text">
+ <div class="di-head"><div class="di-title">
+ <h1 class="hw" title="什么是“house”?">
+ “house”在英语-汉语(简体)词典中的翻译
+ </h1>
+ </div>
- <a href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%AE%80%E4%BD%93/house#translations" class="see-all-translations a--rev"><i class="fcdo fcdo-caret-right" aria-hidden="true"> </i><b>查看所有翻译</b></a>
+ <a href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%AE%80%E4%BD%93/house#translations" class="see-all-translations a--rev"><i class="fcdo fcdo-caret-right" aria-hidden="true"> </i><b>查看所有翻译</b></a>
- </div>
- <div class="di-body"><div class="entry"><div class="entry-body"> <div class="entry-body__el clrd js-share-holder"><div class="pos-header">
- <div class="h3 di-title cdo-section-title-hw"><span class="headword"><span class="hw">house</span></span>
+ </div>
+ <div class="di-body"><div class="entry"><div class="entry-body"> <div class="entry-body__el clrd js-share-holder"><div class="pos-header"><div class="h3 di-title cdo-section-title-hw"><span class="headword"><span class="hw">house</span></span>
<span class="posgram ico-bg"><span class="pos" title="A word that refers to a person, place, idea, event or thing.">noun</span></span>
</div>
- <span class="pron-info"><span class="uk"><span class="region">uk</span>
- <span title="house: listen to British English pronunciation" data-src-mp3="https://dictionary.cambridge.org/zhs/media/english-chinese-simplified/uk_pron/u/ukh/ukhot/ukhotfo023.mp3" data-src-ogg="https://dictionary.cambridge.org/zhs/media/english-chinese-simplified/uk_pron_ogg/u/ukh/ukhot/ukhotfo023.ogg" class="circle circle-btn sound audio_play_button uk">
+ <span class="uk"><span class="region">uk</span>
+ <span title="house: listen to British English pronunciation" data-src-mp3="/zhs/media/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%AE%80%E4%BD%93/uk_pron/u/ukh/ukhot/ukhotfo023.mp3" data-src-ogg="/zhs/media/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%AE%80%E4%BD%93/uk_pron_ogg/u/ukh/ukhot/ukhotfo023.ogg" class="circle circle-btn sound audio_play_button">
<i class='fcdo fcdo-volume-up'>​</i>
</span>
- </span>
- <span class="uk"><span class="pron">/<span class="ipa">haʊs</span>/</span></span>
- </span><span class="pron-info"><span class="us"><span class="region">us</span>
- <span title="house: listen to American pronunciation" data-src-mp3="https://dictionary.cambridge.org/zhs/media/english-chinese-simplified/us_pron/h/hou/house/house.mp3" data-src-ogg="https://dictionary.cambridge.org/zhs/media/english-chinese-simplified/us_pron_ogg/h/hou/house/house.ogg" class="circle circle-btn sound audio_play_button us">
+ <span class="pron">/<span class="ipa">haʊs</span>/</span> </span><span class="us"><span class="region">us</span>
+ <span title="house: listen to American pronunciation" data-src-mp3="/zhs/media/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%AE%80%E4%BD%93/us_pron/h/hou/house/house.mp3" data-src-ogg="/zhs/media/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%AE%80%E4%BD%93/us_pron_ogg/h/hou/house/house.ogg" class="circle circle-btn sound audio_play_button">
<i class='fcdo fcdo-volume-up'>​</i>
</span>
- </span>
- <span class="uk"><span class="pron">/<span class="ipa">haʊs</span>/</span></span>
- </span><span title="Irregular inflection" class="irreg-infls"><span class="inf-group"><span title="Refers to more than one person or thing." class="lab">plural</span> <span class="inf">houses</span> <span class="pron-info"><span class="uk"><span class="region">uk</span>
- <span title="Click to hear the UK pronunciation of this word" data-src-mp3="https://dictionary.cambridge.org/zhs/media/english-chinese-simplified/uk_pron/c/cal/cald4/cald4uk0782.mp3" data-src-ogg="https://dictionary.cambridge.org/zhs/media/english-chinese-simplified/uk_pron_ogg/c/cal/cald4/cald4uk0782.ogg" class="circle circle-btn sound audio_play_button uk">
+ <span class="pron">/<span class="ipa">haʊs</span>/</span> </span><span class="irreg-infls"><span class="inf-group"><span class="lab">plural</span> <span class="inf">houses</span> <span class="uk"><span class="region">uk</span>
+ <span title="Click to hear the UK pronunciation of this word" data-src-mp3="/zhs/media/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%AE%80%E4%BD%93/uk_pron/c/cal/cald4/cald4uk0782.mp3" data-src-ogg="/zhs/media/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%AE%80%E4%BD%93/uk_pron_ogg/c/cal/cald4/cald4uk0782.ogg" class="circle circle-btn sound audio_play_button">
<i class='fcdo fcdo-volume-up'>​</i>
</span>
- </span>
- <span class="uk"><span class="pron">/<span class="ipa">ˈhaʊzɪz</span>/</span></span>
- </span><span class="pron-info"><span class="us"><span class="region">us</span>
- <span title="Click to hear the US pronunciation of this word" data-src-mp3="https://dictionary.cambridge.org/zhs/media/english-chinese-simplified/us_pron/c/cal/cald4/cald4us1174.mp3" data-src-ogg="https://dictionary.cambridge.org/zhs/media/english-chinese-simplified/us_pron_ogg/c/cal/cald4/cald4us1174.ogg" class="circle circle-btn sound audio_play_button us">
+ <span class="pron">/<span class="ipa">ˈhaʊzɪz</span>/</span> </span><span class="us"><span class="region">us</span>
+ <span title="Click to hear the US pronunciation of this word" data-src-mp3="/zhs/media/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%AE%80%E4%BD%93/us_pron/c/cal/cald4/cald4us1174.mp3" data-src-ogg="/zhs/media/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%AE%80%E4%BD%93/us_pron_ogg/c/cal/cald4/cald4us1174.ogg" class="circle circle-btn sound audio_play_button">
<i class='fcdo fcdo-volume-up'>​</i>
</span>
- </span></span></span></span>
+ </span></span></span>
<div class="share rounded js-share">
<span class="point"></span>
@@ -833,9 +953,6 @@ <h1 class="hw" title="什么是“house”?">
</a>
<a class="circle bg--di socialShareLink" title="在Diigo上分享该词条" href='https://www.diigo.com/post?url=https%3A%2F%2Fdictionary.cambridge.org%2Fzhs%2F%25E8%25AF%258D%25E5%2585%25B8%2F%25E8%258B%25B1%25E8%25AF%25AD-%25E6%25B1%2589%25E8%25AF%25AD-%25E7%25AE%2580%25E4%25BD%2593%2Fhouse&title=house%E6%B1%89%E8%AF%AD%28%E7%AE%80%E4%BD%93%29%E7%BF%BB%E8%AF%91%EF%BC%9A%E5%89%91%E6%A1%A5%E8%AF%8D%E5%85%B8' target='_blank' data-social='diigo' data-url='https://www.diigo.com/post?url=https%3A%2F%2Fdictionary.cambridge.org%2Fzhs%2F%25E8%25AF%258D%25E5%2585%25B8%2F%25E8%258B%25B1%25E8%25AF%25AD-%25E6%25B1%2589%25E8%25AF%25AD-%25E7%25AE%2580%25E4%25BD%2593%2Fhouse&title=house%E6%B1%89%E8%AF%AD%28%E7%AE%80%E4%BD%93%29%E7%BF%BB%E8%AF%91%EF%BC%9A%E5%89%91%E6%A1%A5%E8%AF%8D%E5%85%B8' data-object='entry'>
<i class="fcdo fcdo-diigo" aria-hidden="true"></i>
- </a>
- <a class="circle bg--su socialShareLink" title="在StumbleUpon上分享该词条" href='https://www.stumbleupon.com/likecontent?url=https%3A%2F%2Fdictionary.cambridge.org%2Fzhs%2F%25E8%25AF%258D%25E5%2585%25B8%2F%25E8%258B%25B1%25E8%25AF%25AD-%25E6%25B1%2589%25E8%25AF%25AD-%25E7%25AE%2580%25E4%25BD%2593%2Fhouse&title=house%E6%B1%89%E8%AF%AD%28%E7%AE%80%E4%BD%93%29%E7%BF%BB%E8%AF%91%EF%BC%9A%E5%89%91%E6%A1%A5%E8%AF%8D%E5%85%B8' target='_blank' data-social='stumbleupon' data-url='https://www.stumbleupon.com/likecontent?url=https%3A%2F%2Fdictionary.cambridge.org%2Fzhs%2F%25E8%25AF%258D%25E5%2585%25B8%2F%25E8%258B%25B1%25E8%25AF%25AD-%25E6%25B1%2589%25E8%25AF%25AD-%25E7%25AE%2580%25E4%25BD%2593%2Fhouse&title=house%E6%B1%89%E8%AF%AD%28%E7%AE%80%E4%BD%93%29%E7%BF%BB%E8%AF%91%EF%BC%9A%E5%89%91%E6%A1%A5%E8%AF%8D%E5%85%B8' data-object='entry'>
- <i class="fcdo fcdo-stumbleupon" aria-hidden="true"></i>
</a>
<a class="circle bg--tu socialShareLink" title="在Tumblr上分享该词条" href='https://www.tumblr.com/share/link?url=https%3A%2F%2Fdictionary.cambridge.org%2Fzhs%2F%25E8%25AF%258D%25E5%2585%25B8%2F%25E8%258B%25B1%25E8%25AF%25AD-%25E6%25B1%2589%25E8%25AF%25AD-%25E7%25AE%2580%25E4%25BD%2593%2Fhouse&name=house%E6%B1%89%E8%AF%AD%28%E7%AE%80%E4%BD%93%29%E7%BF%BB%E8%AF%91%EF%BC%9A%E5%89%91%E6%A1%A5%E8%AF%8D%E5%85%B8' target='_blank' data-social='tumblr' data-url='https://www.tumblr.com/share/link?url=https%3A%2F%2Fdictionary.cambridge.org%2Fzhs%2F%25E8%25AF%258D%25E5%2585%25B8%2F%25E8%258B%25B1%25E8%25AF%25AD-%25E6%25B1%2589%25E8%25AF%25AD-%25E7%25AE%2580%25E4%25BD%2593%2Fhouse&name=house%E6%B1%89%E8%AF%AD%28%E7%AE%80%E4%BD%93%29%E7%BF%BB%E8%AF%91%EF%BC%9A%E5%89%91%E6%A1%A5%E8%AF%8D%E5%85%B8' data-object='entry'>
<i class="fcdo fcdo-tumblr" aria-hidden="true"></i>
@@ -850,268 +967,167 @@ <h1 class="hw" title="什么是“house”?">
</div>
</div><div class="pos-body">
- <div class="sense-block" id="english-chinese-simplified-1-1-1">
-
- <h3 class="txt-block txt-block--alt2"><span class="hw">house</span> <span class="pos" title="A word that refers to a person, place, idea, event or thing.">noun</span> <span class="guideword" title="Guide word: helps you find the right meaning when a word has more than one meaning">
+ <div class="sense-block" id="english-chinese-simplified-1-1-1"> <h3 class="txt-block txt-block--alt2"><span class="hw">house</span> <span class="pos" title="A word that refers to a person, place, idea, event or thing.">noun</span> <span class="guideword" title="Guide word: helps you find the right meaning when a word has more than one meaning">
(<span>HOME</span>)
- </span></h3>
- <div class="sense-body">
- <div class="def-block pad-indent" data-wl-senseid="ID_00015719_01"><p class="def-head semi-flush"><span class="def-info"><span class="epp-xref A1" title="A1: Beginner level. English Vocabulary Profile symbols A1-C2 show which words and phrases learners know at each level.">A1</span> <span class="gram"><a href="https://dictionary.cambridge.org/zhs/help/codes.html">[<span class="gcs"> <span title="Countable noun: a noun that has both singular and plural forms." class="gc">C</span> </span>]</a></span></span> <b class="def">a <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%AE%80%E4%BD%93/building" title="building">building</a> that <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%AE%80%E4%BD%93/people" title="people">people</a>, usually one <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%AE%80%E4%BD%93/family" title="family">family</a>, <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%AE%80%E4%BD%93/live" title="live">live</a> in</b></p><span class="def-body">
- <span class="trans" lang="zh-Hans">
-
- 房屋，住宅</span>
- <div class="examp emphasized"> <span title="Example" class="eg">a <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%AE%80%E4%BD%93/detached" title="detached">detached</a>/<a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%AE%80%E4%BD%93/semi-detached" title="semi-detached">semi-detached</a> house</span>
- <span class="trans" lang="zh-Hans">
-
- 独立式／半独立式住宅</span>
- </div><div class="examp emphasized"> <span title="Example" class="eg">to <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%AE%80%E4%BD%93/buy" title="buy">buy</a>/<a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%AE%80%E4%BD%93/rent" title="rent">rent</a> a house</span>
- <span class="trans" lang="zh-Hans">
-
- 买／租房子</span>
- </div><div class="examp emphasized"> <span title="Example" class="eg">house <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%AE%80%E4%BD%93/price" title="prices">prices</a></span>
- <span class="trans" lang="zh-Hans">
-
- 房价</span>
- </div><div class="examp emphasized"> <span title="Example" class="eg">She <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%AE%80%E4%BD%93/lives" title="lives">lives</a> in a little house <span class="b">in</span> (<span title="American English" class="lab"><span title="American English" class="region">US</span></span> <span class="b">on</span>) Cross Street.</span>
- <span class="trans" lang="zh-Hans">
-
- 她住在十字街上的一所小房子里。</span>
- </div> <div class="xref see_also"><strong class="xref-title">See also</strong>
-
- <div class="item"><a href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%AE%80%E4%BD%93/farmhouse" title="farmhouse的意思"><span class="x-h">farmhouse</span></a></div>
+ </span></h3> <div class="sense-body">
+ <div class="def-block pad-indent" data-wl-senseid="ID_00015719_01"><p class="def-head semi-flush"><span class="def-info"><span class="epp-xref A1">A1</span> <span class="gram"><a href="https://dictionary.cambridge.org/zhs/help/codes.html">[<span class="gcs"> <span class="gc">C</span> </span>]</a></span></span> <b class="def">a <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%AE%80%E4%BD%93/building" title="building">building</a> that <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%AE%80%E4%BD%93/people" title="people">people</a>, usually one <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%AE%80%E4%BD%93/family" title="family">family</a>, <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%AE%80%E4%BD%93/live" title="live">live</a> in</b></p><span class="def-body">
+ <span class="trans" lang="zh-Hans">房屋，住宅</span>
+ <div class="examp emphasized"> <span class="eg">a <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%AE%80%E4%BD%93/detached" title="detached">detached</a>/<a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%AE%80%E4%BD%93/semi-detached" title="semi-detached">semi-detached</a> house</span>
+ <span class="trans" lang="zh-Hans">独立式／半独立式住宅</span>
+ </div><div class="examp emphasized"> <span class="eg">to <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%AE%80%E4%BD%93/buy" title="buy">buy</a>/<a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%AE%80%E4%BD%93/rent" title="rent">rent</a> a house</span>
+ <span class="trans" lang="zh-Hans">买／租房子</span>
+ </div><div class="examp emphasized"> <span class="eg">house <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%AE%80%E4%BD%93/price" title="prices">prices</a></span>
+ <span class="trans" lang="zh-Hans">房价</span>
+ </div><div class="examp emphasized"> <span class="eg">She <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%AE%80%E4%BD%93/lives" title="lives">lives</a> in a little house <span class="b">in</span> (<span class="lab"><span class="region">US</span></span> <span class="b">on</span>) Cross Street.</span>
+ <span class="trans" lang="zh-Hans">她住在十字街上的一所小房子里。</span>
+ </div> <div class="xref see_also"><strong class="xref-title"> 也请见 </strong>
+
+ <div class="item"><a href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%AE%80%E4%BD%93/farmhouse" title="farmhouse的意思"><span class="x-h">farmhouse</span> <span class="x-pos">noun</span></a></div>
<div class="item"><a href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%AE%80%E4%BD%93/roadhouse" title="roadhouse的意思"><span class="x-h">roadhouse</span></a></div></div></span></div>
- <div class="def-block pad-indent" data-wl-senseid="ID_00015719_02"><p class="def-head semi-flush"><span class="def-info"><span class="freq">›</span> <span class="gram"><a href="https://dictionary.cambridge.org/zhs/help/codes.html">[<span class="gcs"> <span title="Countable noun: a noun that has both singular and plural forms." class="gc">C</span> <span class="gc">usually singular</span> </span>]</a></span></span> <b class="def">all the <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%AE%80%E4%BD%93/people" title="people">people</a> <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%AE%80%E4%BD%93/living" title="living">living</a> in a house</b></p><span class="def-body">
- <span class="trans" lang="zh-Hans">
-
- 住在一所房子里的人；全家人</span>
- <div class="examp emphasized"> <span title="Example" class="eg">Try not to <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%AE%80%E4%BD%93/wake" title="wake">wake</a> <span class="b">the <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%AE%80%E4%BD%93/whole" title="whole">whole</a></span> house when you come in!</span>
- <span class="trans" lang="zh-Hans">
-
- 你进来的时候不要把全家人都吵醒！</span>
+ <div class="def-block pad-indent" data-wl-senseid="ID_00015719_02"><p class="def-head semi-flush"><span class="def-info"><span class="freq">›</span> <span class="gram"><a href="https://dictionary.cambridge.org/zhs/help/codes.html">[<span class="gcs"> <span class="gc">C</span> <span class="gc">usually singular</span> </span>]</a></span></span> <b class="def">all the <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%AE%80%E4%BD%93/people" title="people">people</a> <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%AE%80%E4%BD%93/living" title="living">living</a> in a house</b></p><span class="def-body">
+ <span class="trans" lang="zh-Hans">住在一所房子里的人；全家人</span>
+ <div class="examp emphasized"> <span class="eg">Try not to <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%AE%80%E4%BD%93/wake" title="wake">wake</a> <span class="b">the <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%AE%80%E4%BD%93/whole" title="whole">whole</a></span> house when you come in!</span>
+ <span class="trans" lang="zh-Hans">你进来的时候不要把全家人都吵醒！</span>
</div></span></div>
- <div class="def-block pad-indent" data-wl-senseid="ID_00015719_03"><p class="def-head semi-flush"><span class="def-info"><span class="freq">›</span> <span class="gram"><a href="https://dictionary.cambridge.org/zhs/help/codes.html">[<span class="gcs"> <span title="Countable noun: a noun that has both singular and plural forms." class="gc">C</span> </span>]</a></span></span> <b class="def">a <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%AE%80%E4%BD%93/building" title="building">building</a> where <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%AE%80%E4%BD%93/animal" title="animals">animals</a> are <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%AE%80%E4%BD%93/kept" title="kept">kept</a></b></p><span class="def-body">
- <span class="trans" lang="zh-Hans">
-
- 动物的笼舍</span>
- <div class="examp emphasized"> <span title="Example" class="eg">the <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%AE%80%E4%BD%93/monkey" title="monkey">monkey</a>/<a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%AE%80%E4%BD%93/lion" title="lion">lion</a> house at the <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%AE%80%E4%BD%93/zoo" title="zoo">zoo</a></span>
- <span class="trans" lang="zh-Hans">
-
- 动物园里猴子／狮子的笼舍</span>
- </div><div class="examp emphasized"> <span title="Example" class="eg">a <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%AE%80%E4%BD%93/hen" title="hen">hen</a> house</span>
- <span class="trans" lang="zh-Hans">
-
- 鸡舍</span>
+ <div class="def-block pad-indent" data-wl-senseid="ID_00015719_03"><p class="def-head semi-flush"><span class="def-info"><span class="freq">›</span> <span class="gram"><a href="https://dictionary.cambridge.org/zhs/help/codes.html">[<span class="gcs"> <span class="gc">C</span> </span>]</a></span></span> <b class="def">a <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%AE%80%E4%BD%93/building" title="building">building</a> where <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%AE%80%E4%BD%93/animal" title="animals">animals</a> are <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%AE%80%E4%BD%93/kept" title="kept">kept</a></b></p><span class="def-body">
+ <span class="trans" lang="zh-Hans">动物的笼舍</span>
+ <div class="examp emphasized"> <span class="eg">the <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%AE%80%E4%BD%93/monkey" title="monkey">monkey</a>/<a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%AE%80%E4%BD%93/lion" title="lion">lion</a> house at the <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%AE%80%E4%BD%93/zoo" title="zoo">zoo</a></span>
+ <span class="trans" lang="zh-Hans">动物园里猴子／狮子的笼舍</span>
+ </div><div class="examp emphasized"> <span class="eg">a <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%AE%80%E4%BD%93/hen" title="hen">hen</a> house</span>
+ <span class="trans" lang="zh-Hans">鸡舍</span>
</div></span></div>
<div class="extraexamps"><p class="accord-basic js-accord accord-basic--shallow">更多范例</p><ul class="unstyled emphasized pad-indent"><li class="eg">It <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%AE%80%E4%BD%93/cost" title="costs">costs</a> a lot to <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%AE%80%E4%BD%93/buy" title="buy">buy</a> a house in this <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%AE%80%E4%BD%93/part" title="part">part</a> of London.</li><li class="eg">I'm <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%AE%80%E4%BD%93/worried" title="worried">worried</a> about <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%AE%80%E4%BD%93/leave" title="leaving">leaving</a> him <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%AE%80%E4%BD%93/alone" title="alone">alone</a> in the house all <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%AE%80%E4%BD%93/day" title="day">day</a>.</li><li class="eg">She had to be <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%AE%80%E4%BD%93/rescue" title="rescued">rescued</a> by her <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%AE%80%E4%BD%93/neighbour" title="neighbours">neighbours</a> when her house <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%AE%80%E4%BD%93/caught" title="caught">caught</a> <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%AE%80%E4%BD%93/fire" title="fire">fire</a>.</li><li class="eg">It's a <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%AE%80%E4%BD%93/typical" title="typical">typical</a> <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%AE%80%E4%BD%93/country" title="country">country</a> <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%AE%80%E4%BD%93/estate" title="estate">estate</a> with a <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%AE%80%E4%BD%93/large" title="large">large</a> house for the <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%AE%80%E4%BD%93/owner" title="owner">owner</a>, <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%AE%80%E4%BD%93/farm" title="farm">farm</a> <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%AE%80%E4%BD%93/building" title="buildings">buildings</a> and <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%AE%80%E4%BD%93/estate" title="estate">estate</a> <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%AE%80%E4%BD%93/worker" title="workers">workers</a>' houses.</li><li class="eg">Would you like to come round to my house after <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%AE%80%E4%BD%93/school" title="school">school</a>?</li></ul></div>
- </div>
-
- </div>
+ </div> </div>
- <div class="sense-block" id="english-chinese-simplified-1-1-2">
-
- <h3 class="txt-block txt-block--alt2"><span class="hw">house</span> <span class="pos" title="A word that refers to a person, place, idea, event or thing.">noun</span> <span class="guideword" title="Guide word: helps you find the right meaning when a word has more than one meaning">
+ <div class="sense-block" id="english-chinese-simplified-1-1-2"> <h3 class="txt-block txt-block--alt2"><span class="hw">house</span> <span class="pos" title="A word that refers to a person, place, idea, event or thing.">noun</span> <span class="guideword" title="Guide word: helps you find the right meaning when a word has more than one meaning">
(<span>PUBLIC BUILDING</span>)
- </span></h3>
- <div class="sense-body">
- <div class="def-block pad-indent" data-wl-senseid="ID_00015719_04"><p class="def-head semi-flush"><span class="def-info"><span class="freq">›</span> <span class="gram"><a href="https://dictionary.cambridge.org/zhs/help/codes.html">[<span class="gcs"> <span title="Countable noun: a noun that has both singular and plural forms." class="gc">C</span> </span>]</a></span></span> <b class="def">a <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%AE%80%E4%BD%93/building" title="building">building</a> or <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%AE%80%E4%BD%93/part" title="part">part</a> of a <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%AE%80%E4%BD%93/building" title="building">building</a> that is used for a <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%AE%80%E4%BD%93/special" title="special">special</a> <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%AE%80%E4%BD%93/purpose" title="purpose">purpose</a></b></p><span class="def-body">
- <span class="trans" lang="zh-Hans">
-
- （有特定用途的）大楼，大厦</span>
- <div class="examp emphasized"> <span title="Example" class="eg">the Sydney Opera House</span>
- <span class="trans" lang="zh-Hans">
-
- 悉尼歌剧院</span>
- </div><div class="examp emphasized"> <span title="Example" class="eg">Broadcasting House</span>
- <span class="trans" lang="zh-Hans">
-
- 广播电台大楼</span>
+ </span></h3> <div class="sense-body">
+ <div class="def-block pad-indent" data-wl-senseid="ID_00015719_04"><p class="def-head semi-flush"><span class="def-info"><span class="freq">›</span> <span class="gram"><a href="https://dictionary.cambridge.org/zhs/help/codes.html">[<span class="gcs"> <span class="gc">C</span> </span>]</a></span></span> <b class="def">a <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%AE%80%E4%BD%93/building" title="building">building</a> or <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%AE%80%E4%BD%93/part" title="part">part</a> of a <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%AE%80%E4%BD%93/building" title="building">building</a> that is used for a <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%AE%80%E4%BD%93/special" title="special">special</a> <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%AE%80%E4%BD%93/purpose" title="purpose">purpose</a></b></p><span class="def-body">
+ <span class="trans" lang="zh-Hans">（有特定用途的）大楼，大厦</span>
+ <div class="examp emphasized"> <span class="eg">the Sydney Opera House</span>
+ <span class="trans" lang="zh-Hans">悉尼歌剧院</span>
+ </div><div class="examp emphasized"> <span class="eg">Broadcasting House</span>
+ <span class="trans" lang="zh-Hans">广播电台大楼</span>
</div></span></div>
- </div>
-
- </div>
-
- <div class="sense-block" id="english-chinese-simplified-1-1-3">
+ </div> </div>
- <h3 class="txt-block txt-block--alt2"><span class="hw">house</span> <span class="pos" title="A word that refers to a person, place, idea, event or thing.">noun</span> <span class="guideword" title="Guide word: helps you find the right meaning when a word has more than one meaning">
+ <div class="sense-block" id="english-chinese-simplified-1-1-3"> <h3 class="txt-block txt-block--alt2"><span class="hw">house</span> <span class="pos" title="A word that refers to a person, place, idea, event or thing.">noun</span> <span class="guideword" title="Guide word: helps you find the right meaning when a word has more than one meaning">
(<span>BUSINESS</span>)
- </span></h3>
- <div class="sense-body">
+ </span></h3> <div class="sense-body">
<div class="def-block pad-indent" data-wl-senseid="ID_00015719_05"><p class="def-head semi-flush"><span class="def-info"><span class="freq">›</span> </span><b class="def">a <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%AE%80%E4%BD%93/company" title="company">company</a> that is <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%AE%80%E4%BD%93/involved" title="involved">involved</a> in a <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%AE%80%E4%BD%93/particular" title="particular">particular</a> <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%AE%80%E4%BD%93/area" title="area">area</a> of <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%AE%80%E4%BD%93/business" title="business">business</a></b></p><span class="def-body">
- <span class="trans" lang="zh-Hans">
-
- （尤指出版图书或设计服装的）公司，机构，商行</span>
- <div class="examp emphasized"> <span title="Example" class="eg">a <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%AE%80%E4%BD%93/publish" title="publishing">publishing</a> house</span>
- <span class="trans" lang="zh-Hans">
-
- 出版社</span>
- </div><div class="examp emphasized"> <span title="Example" class="eg">a <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%AE%80%E4%BD%93/fashion" title="fashion">fashion</a> house</span>
- <span class="trans" lang="zh-Hans">
-
- 时装屋</span>
- </div><div class="examp emphasized"><span title="British English" class="lab"><span title="British English" class="region">UK</span></span> <span title="Example" class="eg">a <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%AE%80%E4%BD%93/curry" title="curry">curry</a> house <span class="gloss">(= a <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%AE%80%E4%BD%93/south" title="South">South</a> <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%AE%80%E4%BD%93/asian" title="Asian">Asian</a> <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%AE%80%E4%BD%93/restaurant" title="restaurant">restaurant</a>)</span></span>
- <span class="trans" lang="zh-Hans">
-
- 咖喱屋（或餐厅）</span>
+ <span class="trans" lang="zh-Hans">（尤指出版图书或设计服装的）公司，机构，商行</span>
+ <div class="examp emphasized"> <span class="eg">a <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%AE%80%E4%BD%93/publish" title="publishing">publishing</a> house</span>
+ <span class="trans" lang="zh-Hans">出版社</span>
+ </div><div class="examp emphasized"> <span class="eg">a <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%AE%80%E4%BD%93/fashion" title="fashion">fashion</a> house</span>
+ <span class="trans" lang="zh-Hans">时装屋</span>
+ </div><div class="examp emphasized"><span class="lab"><span class="region">UK</span></span> <span class="eg">a <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%AE%80%E4%BD%93/curry" title="curry">curry</a> house <span class="gloss">(= a <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%AE%80%E4%BD%93/south" title="South">South</a> <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%AE%80%E4%BD%93/asian" title="Asian">Asian</a> <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%AE%80%E4%BD%93/restaurant" title="restaurant">restaurant</a>)</span></span>
+ <span class="trans" lang="zh-Hans">咖喱屋（或餐厅）</span>
</div></span></div>
- </div>
-
- </div>
-
- <div class="sense-block" id="english-chinese-simplified-1-1-4">
+ </div>
+ <div id='ad_contentslot_1' class='am-default contentslot'>
+ <script type='text/javascript'>
+ googletag.cmd.push(function() { googletag.display('ad_contentslot_1'); });
+ </script>
+ </div>
+ </div>
- <h3 class="txt-block txt-block--alt2"><span class="hw">house</span> <span class="pos" title="A word that refers to a person, place, idea, event or thing.">noun</span> <span class="guideword" title="Guide word: helps you find the right meaning when a word has more than one meaning">
+ <div class="sense-block" id="english-chinese-simplified-1-1-4"> <h3 class="txt-block txt-block--alt2"><span class="hw">house</span> <span class="pos" title="A word that refers to a person, place, idea, event or thing.">noun</span> <span class="guideword" title="Guide word: helps you find the right meaning when a word has more than one meaning">
(<span>MUSIC</span>)
- </span></h3>
- <div class="sense-body">
- <div class="def-block pad-indent" data-wl-senseid="ID_00015719_06"><p class="def-head semi-flush"><span class="def-info"><span class="freq">›</span> <span class="gram"><a href="https://dictionary.cambridge.org/zhs/help/codes.html">[<span class="gcs"> <span title="Uncountable noun: noun with no plural form. Cannot be used with 'a', 'an', or 'one'." class="gc">U</span> </span>]</a></span> <span title="Variant information" class="var"><span class="lab">also</span> <span title="Variant form" class="v">house music</span></span></span> <b class="def"><a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%AE%80%E4%BD%93/popular" title="popular">popular</a> <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%AE%80%E4%BD%93/dance" title="dance">dance</a> <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%AE%80%E4%BD%93/music" title="music">music</a> with a <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%AE%80%E4%BD%93/fast" title="fast">fast</a> <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%AE%80%E4%BD%93/regular" title="regular">regular</a> <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%AE%80%E4%BD%93/beat" title="beat">beat</a>, usually <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%AE%80%E4%BD%93/produce" title="produced">produced</a> on <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%AE%80%E4%BD%93/electronic" title="electronic">electronic</a> <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%AE%80%E4%BD%93/equipment" title="equipment">equipment</a></b></p><span class="def-body">
- <span class="trans" lang="zh-Hans">
-
- 豪斯音乐，货仓音乐（电子乐器演奏的一种快节奏的流行音乐）</span>
- <div class="examp emphasized"> <span title="Example" class="eg">House <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%AE%80%E4%BD%93/music" title="music">music</a> first <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%AE%80%E4%BD%93/appear" title="appeared">appeared</a> in the late 1980s.</span>
- <span class="trans" lang="zh-Hans">
-
- 豪斯音乐最早出现于20世纪80年代晚期。</span>
+ </span></h3> <div class="sense-body">
+ <div class="def-block pad-indent" data-wl-senseid="ID_00015719_06"><p class="def-head semi-flush"><span class="def-info"><span class="freq">›</span> <span class="gram"><a href="https://dictionary.cambridge.org/zhs/help/codes.html">[<span class="gcs"> <span class="gc">U</span> </span>]</a></span> <span class="var"><span class="lab">also</span> <span class="v">house music</span></span></span> <b class="def"><a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%AE%80%E4%BD%93/popular" title="popular">popular</a> <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%AE%80%E4%BD%93/dance" title="dance">dance</a> <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%AE%80%E4%BD%93/music" title="music">music</a> with a <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%AE%80%E4%BD%93/fast" title="fast">fast</a> <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%AE%80%E4%BD%93/regular" title="regular">regular</a> <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%AE%80%E4%BD%93/beat" title="beat">beat</a>, usually <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%AE%80%E4%BD%93/produce" title="produced">produced</a> on <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%AE%80%E4%BD%93/electronic" title="electronic">electronic</a> <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%AE%80%E4%BD%93/equipment" title="equipment">equipment</a></b></p><span class="def-body">
+ <span class="trans" lang="zh-Hans">豪斯音乐，货仓音乐（电子乐器演奏的一种快节奏的流行音乐）</span>
+ <div class="examp emphasized"> <span class="eg">House <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%AE%80%E4%BD%93/music" title="music">music</a> first <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%AE%80%E4%BD%93/appear" title="appeared">appeared</a> in the late 1980s.</span>
+ <span class="trans" lang="zh-Hans">豪斯音乐最早出现于20世纪80年代晚期。</span>
</div></span></div>
- </div>
+ </div> </div>
- </div>
-
- <div class="sense-block" id="english-chinese-simplified-1-1-5">
-
- <h3 class="txt-block txt-block--alt2"><span class="hw">house</span> <span class="pos" title="A word that refers to a person, place, idea, event or thing.">noun</span> <span class="guideword" title="Guide word: helps you find the right meaning when a word has more than one meaning">
+ <div class="sense-block" id="english-chinese-simplified-1-1-5"> <h3 class="txt-block txt-block--alt2"><span class="hw">house</span> <span class="pos" title="A word that refers to a person, place, idea, event or thing.">noun</span> <span class="guideword" title="Guide word: helps you find the right meaning when a word has more than one meaning">
(<span>SCHOOL GROUP</span>)
- </span></h3>
- <div class="sense-body">
- <div class="def-block pad-indent" data-wl-senseid="ID_00015719_07"><p class="def-head semi-flush"><span class="def-info"><span class="freq">›</span> <span class="gram"><a href="https://dictionary.cambridge.org/zhs/help/codes.html">[<span class="gcs"> <span title="Countable noun: a noun that has both singular and plural forms." class="gc">C</span> </span>]</a></span> <span title="British English" class="lab"><span title="British English" class="region">UK</span></span></span> <b class="def">any of a <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%AE%80%E4%BD%93/small" title="small">small</a> <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%AE%80%E4%BD%93/number" title="number">number</a> of <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%AE%80%E4%BD%93/group" title="groups">groups</a> that the <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%AE%80%E4%BD%93/children" title="children">children</a> in a <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%AE%80%E4%BD%93/school" title="school">school</a> are put in for <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%AE%80%E4%BD%93/sports" title="sports">sports</a> and other competitions</b></p><span class="def-body">
- <span class="trans" lang="zh-Hans">
-
- （学校里为进行比赛而分成的）组</span>
- <div class="examp emphasized"> <span title="Example" class="eg">an inter-house <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%AE%80%E4%BD%93/hockey" title="hockey">hockey</a> <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%AE%80%E4%BD%93/match" title="match">match</a></span>
- <span class="trans" lang="zh-Hans">
-
- 校内小组之间的足球赛</span>
+ </span></h3> <div class="sense-body">
+ <div class="def-block pad-indent" data-wl-senseid="ID_00015719_07"><p class="def-head semi-flush"><span class="def-info"><span class="freq">›</span> <span class="gram"><a href="https://dictionary.cambridge.org/zhs/help/codes.html">[<span class="gcs"> <span class="gc">C</span> </span>]</a></span> <span class="lab"><span class="region">UK</span></span></span> <b class="def">any of a <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%AE%80%E4%BD%93/small" title="small">small</a> <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%AE%80%E4%BD%93/number" title="number">number</a> of <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%AE%80%E4%BD%93/group" title="groups">groups</a> that the <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%AE%80%E4%BD%93/children" title="children">children</a> in a <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%AE%80%E4%BD%93/school" title="school">school</a> are put in for <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%AE%80%E4%BD%93/sports" title="sports">sports</a> and other competitions</b></p><span class="def-body">
+ <span class="trans" lang="zh-Hans">（学校里为进行比赛而分成的）组</span>
+ <div class="examp emphasized"> <span class="eg">an inter-house <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%AE%80%E4%BD%93/hockey" title="hockey">hockey</a> <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%AE%80%E4%BD%93/match" title="match">match</a></span>
+ <span class="trans" lang="zh-Hans">校内小组之间的足球赛</span>
</div></span></div>
- </div>
-
+ </div> </div>
- <div id='ad_contentslot_1' class='am-default contentslot'>
+ <div class="sense-block" id="english-chinese-simplified-1-1-6"> <h3 class="txt-block txt-block--alt2"><span class="hw">house</span> <span class="pos" title="A word that refers to a person, place, idea, event or thing.">noun</span> <span class="guideword" title="Guide word: helps you find the right meaning when a word has more than one meaning">
+ (<span>FAMILY</span>)
+ </span></h3> <div class="sense-body">
+ <div class="def-block pad-indent" data-wl-senseid="ID_00015719_08"><p class="def-head semi-flush"><span class="def-info"><span class="freq">›</span> <span class="gram"><a href="https://dictionary.cambridge.org/zhs/help/codes.html">[<span class="gcs"> <span class="gc">C</span> </span>]</a></span> <span class="lab"><span class="region">UK</span></span></span> <b class="def">an <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%AE%80%E4%BD%93/important" title="important">important</a> <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%AE%80%E4%BD%93/family" title="family">family</a>, <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%AE%80%E4%BD%93/especially" title="especially">especially</a> a <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%AE%80%E4%BD%93/royal" title="royal">royal</a> one</b></p><span class="def-body">
+ <span class="trans" lang="zh-Hans">家族；（尤指）皇室</span>
+ <div class="examp emphasized"> <span class="eg">The British Royal Family <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%AE%80%E4%BD%93/belong" title="belong">belong</a> to the House of Windsor.</span>
+ <span class="trans" lang="zh-Hans">英国王室属于温莎家族。</span>
+ </div></span></div>
+ </div>
+ <div id='ad_contentslot_2' class='am-default contentslot'>
<script type='text/javascript'>
- googletag.cmd.push(function() { googletag.display('ad_contentslot_1'); });
+ googletag.cmd.push(function() { googletag.display('ad_contentslot_2'); });
</script>
</div>
- </div>
+ </div>
- <div class="sense-block" id="english-chinese-simplified-1-1-6">
-
- <h3 class="txt-block txt-block--alt2"><span class="hw">house</span> <span class="pos" title="A word that refers to a person, place, idea, event or thing.">noun</span> <span class="guideword" title="Guide word: helps you find the right meaning when a word has more than one meaning">
- (<span>FAMILY</span>)
- </span></h3>
- <div class="sense-body">
- <div class="def-block pad-indent" data-wl-senseid="ID_00015719_08"><p class="def-head semi-flush"><span class="def-info"><span class="freq">›</span> <span class="gram"><a href="https://dictionary.cambridge.org/zhs/help/codes.html">[<span class="gcs"> <span title="Countable noun: a noun that has both singular and plural forms." class="gc">C</span> </span>]</a></span> <span title="British English" class="lab"><span title="British English" class="region">UK</span></span></span> <b class="def">an <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%AE%80%E4%BD%93/important" title="important">important</a> <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%AE%80%E4%BD%93/family" title="family">family</a>, <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%AE%80%E4%BD%93/especially" title="especially">especially</a> a <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%AE%80%E4%BD%93/royal" title="royal">royal</a> one</b></p><span class="def-body">
- <span class="trans" lang="zh-Hans">
-
- 家族；（尤指）皇室</span>
- <div class="examp emphasized"> <span title="Example" class="eg">The British Royal Family <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%AE%80%E4%BD%93/belong" title="belong">belong</a> to the House of Windsor.</span>
- <span class="trans" lang="zh-Hans">
-
- 英国王室属于温莎家族。</span>
- </div></span></div>
- </div>
-
- </div>
-
- <div class="sense-block" id="english-chinese-simplified-1-1-7">
-
- <h3 class="txt-block txt-block--alt2"><span class="hw">house</span> <span class="pos" title="A word that refers to a person, place, idea, event or thing.">noun</span> <span class="guideword" title="Guide word: helps you find the right meaning when a word has more than one meaning">
+ <div class="sense-block" id="english-chinese-simplified-1-1-7"> <h3 class="txt-block txt-block--alt2"><span class="hw">house</span> <span class="pos" title="A word that refers to a person, place, idea, event or thing.">noun</span> <span class="guideword" title="Guide word: helps you find the right meaning when a word has more than one meaning">
(<span>POLITICS</span>)
- </span></h3>
- <div class="sense-body">
- <div class="def-block pad-indent" data-wl-senseid="ID_00015719_09"><p class="def-head semi-flush"><span class="def-info"><span class="freq">›</span> <span class="gram"><a href="https://dictionary.cambridge.org/zhs/help/codes.html">[<span class="gcs"> <span title="Countable noun: a noun that has both singular and plural forms." class="gc">C</span> </span>]</a></span></span> <b class="def">an <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%AE%80%E4%BD%93/organization" title="organization">organization</a> that makes <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%AE%80%E4%BD%93/law" title="laws">laws</a>, or <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%AE%80%E4%BD%93/its" title="its">its</a> <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%AE%80%E4%BD%93/meeting" title="meeting">meeting</a> <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%AE%80%E4%BD%93/place" title="place">place</a></b></p><span class="def-body">
- <span class="trans" lang="zh-Hans">
-
- 议会，议院</span>
+ </span></h3> <div class="sense-body">
+ <div class="def-block pad-indent" data-wl-senseid="ID_00015719_09"><p class="def-head semi-flush"><span class="def-info"><span class="freq">›</span> <span class="gram"><a href="https://dictionary.cambridge.org/zhs/help/codes.html">[<span class="gcs"> <span class="gc">C</span> </span>]</a></span></span> <b class="def">an <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%AE%80%E4%BD%93/organization" title="organization">organization</a> that makes <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%AE%80%E4%BD%93/law" title="laws">laws</a>, or <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%AE%80%E4%BD%93/its" title="its">its</a> <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%AE%80%E4%BD%93/meeting" title="meeting">meeting</a> <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%AE%80%E4%BD%93/place" title="place">place</a></b></p><span class="def-body">
+ <span class="trans" lang="zh-Hans">议会，议院</span>
</span></div>
- <div class="phrase-block pad-indent"><span class="phrase-head"><span title="Phrase" class="phrase-title"><span class="phrase">the House</span></span></span><div class="phrase-body pad-indent">
+ <div class="phrase-block pad-indent"><span class="phrase-head"><span class="phrase-title"><span class="phrase">the House</span></span></span><div class="phrase-body pad-indent">
<div class="def-block pad-indent" data-wl-senseid="ID_00015719_10"><p class="def-head semi-flush"><span class="def-info"><span class="freq">›</span> </span><b class="def">the <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%AE%80%E4%BD%93/member" title="members">members</a> of the <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%AE%80%E4%BD%93/organization" title="organization">organization</a> that makes <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%AE%80%E4%BD%93/law" title="laws">laws</a></b></p><span class="def-body">
- <span class="trans" lang="zh-Hans">
-
- 议员</span>
- <div class="examp emphasized"> <span title="Example" class="eg">The House <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%AE%80%E4%BD%93/began" title="began">began</a> <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%AE%80%E4%BD%93/debate" title="debating">debating</a> the <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%AE%80%E4%BD%93/proposal" title="proposal">proposal</a> at 3 p.m.</span>
- <span class="trans" lang="zh-Hans">
-
- 议员们于下午3点开始就提案进行辩论。</span>
- </div> <div class="xref see_also"><strong class="xref-title">See also</strong>
+ <span class="trans" lang="zh-Hans">议员</span>
+ <div class="examp emphasized"> <span class="eg">The House <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%AE%80%E4%BD%93/began" title="began">began</a> <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%AE%80%E4%BD%93/debate" title="debating">debating</a> the <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%AE%80%E4%BD%93/proposal" title="proposal">proposal</a> at 3 p.m.</span>
+ <span class="trans" lang="zh-Hans">议员们于下午3点开始就提案进行辩论。</span>
+ </div> <div class="xref see_also"><strong class="xref-title"> 也请见 </strong>
<div class="item"><a href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%AE%80%E4%BD%93/the-house-of-commons" title="the House of Commons的意思"><span class="x-h">the House of Commons</span></a></div>
<div class="item"><a href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%AE%80%E4%BD%93/the-house-of-lords" title="the House of Lords的意思"><span class="x-h">the House of Lords</span></a></div>
<div class="item"><a href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%AE%80%E4%BD%93/the-house-of-representatives" title="the House of Representatives的意思"><span class="x-h">the House of Representatives</span></a></div></div></span></div>
- </div></div>
- <div class="def-block pad-indent" data-wl-senseid="ID_00015719_11"><p class="def-head semi-flush"><span class="def-info"><span class="freq">›</span> <span class="gram"><a href="https://dictionary.cambridge.org/zhs/help/codes.html">[<span class="gcs"> <span title="Singular noun: a noun only used in singular form and which has no plural form." class="gc">S</span> </span>]</a></span></span> <b class="def">the <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%AE%80%E4%BD%93/group" title="group">group</a> of <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%AE%80%E4%BD%93/people" title="people">people</a> who <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%AE%80%E4%BD%93/suggest" title="suggest">suggest</a> a <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%AE%80%E4%BD%93/subject" title="subject">subject</a> for a <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%AE%80%E4%BD%93/debate" title="debate">debate</a></b></p><span class="def-body">
- <span class="trans" lang="zh-Hans">
-
- 辩论的发起方</span>
- <div class="examp emphasized"> <span title="Example" class="eg">The <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%AE%80%E4%BD%93/motion" title="motion">motion</a> for tonight's <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%AE%80%E4%BD%93/debate" title="debate">debate</a> is, "This house <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%AE%80%E4%BD%93/believe" title="believes">believes</a> that <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%AE%80%E4%BD%93/capital" title="capital">capital</a> <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%AE%80%E4%BD%93/punishment" title="punishment">punishment</a> should be <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%AE%80%E4%BD%93/abolish" title="abolished">abolished</a>."</span>
- <span class="trans" lang="zh-Hans">
-
- 今晚的辩题是“正方认为应该废除死刑”。</span>
+ </div></div>
+ <div class="def-block pad-indent" data-wl-senseid="ID_00015719_11"><p class="def-head semi-flush"><span class="def-info"><span class="freq">›</span> <span class="gram"><a href="https://dictionary.cambridge.org/zhs/help/codes.html">[<span class="gcs"> <span class="gc">S</span> </span>]</a></span></span> <b class="def">the <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%AE%80%E4%BD%93/group" title="group">group</a> of <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%AE%80%E4%BD%93/people" title="people">people</a> who <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%AE%80%E4%BD%93/suggest" title="suggest">suggest</a> a <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%AE%80%E4%BD%93/subject" title="subject">subject</a> for a <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%AE%80%E4%BD%93/debate" title="debate">debate</a></b></p><span class="def-body">
+ <span class="trans" lang="zh-Hans">辩论的发起方</span>
+ <div class="examp emphasized"> <span class="eg">The <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%AE%80%E4%BD%93/motion" title="motion">motion</a> for tonight's <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%AE%80%E4%BD%93/debate" title="debate">debate</a> is, "This house <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%AE%80%E4%BD%93/believe" title="believes">believes</a> that <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%AE%80%E4%BD%93/capital" title="capital">capital</a> <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%AE%80%E4%BD%93/punishment" title="punishment">punishment</a> should be <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%AE%80%E4%BD%93/abolish" title="abolished">abolished</a>."</span>
+ <span class="trans" lang="zh-Hans">今晚的辩题是“正方认为应该废除死刑”。</span>
</div></span></div>
- </div>
+ </div> </div>
- </div>
-
- <div class="sense-block" id="english-chinese-simplified-1-1-8">
-
- <h3 class="txt-block txt-block--alt2"><span class="hw">house</span> <span class="pos" title="A word that refers to a person, place, idea, event or thing.">noun</span> <span class="guideword" title="Guide word: helps you find the right meaning when a word has more than one meaning">
+ <div class="sense-block" id="english-chinese-simplified-1-1-8"> <h3 class="txt-block txt-block--alt2"><span class="hw">house</span> <span class="pos" title="A word that refers to a person, place, idea, event or thing.">noun</span> <span class="guideword" title="Guide word: helps you find the right meaning when a word has more than one meaning">
(<span>PEOPLE AT THEATRE</span>)
- </span></h3>
- <div class="sense-body">
- <div class="def-block pad-indent" data-wl-senseid="ID_00015719_12"><p class="def-head semi-flush"><span class="def-info"><span class="epp-xref C2" title="C2: Proficiency level. English Vocabulary Profile symbols A1-C2 show which words and phrases learners know at each level.">C2</span> <span class="gram"><a href="https://dictionary.cambridge.org/zhs/help/codes.html">[<span class="gcs"> <span title="Countable noun: a noun that has both singular and plural forms." class="gc">C</span> </span>]</a></span></span> <b class="def">the <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%AE%80%E4%BD%93/people" title="people">people</a> <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%AE%80%E4%BD%93/watch" title="watching">watching</a> a <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%AE%80%E4%BD%93/performance" title="performance">performance</a>, <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%AE%80%E4%BD%93/especially" title="especially">especially</a> in a <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%AE%80%E4%BD%93/theatre" title="theatre">theatre</a></b></p><span class="def-body">
- <span class="trans" lang="zh-Hans">
-
- 观众，（尤指）剧院观众</span>
- <div class="examp emphasized"> <span title="Example" class="eg">The <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%AE%80%E4%BD%93/opera" title="opera">opera</a> <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%AE%80%E4%BD%93/play" title="played">played</a> to a <span class="b"><a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%AE%80%E4%BD%93/full" title="full">full</a>/<a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%AE%80%E4%BD%93/packed" title="packed">packed</a></span> house.</span>
- <span class="trans" lang="zh-Hans">
-
- 该歌剧演出时观众爆满。</span>
+ </span></h3> <div class="sense-body">
+ <div class="def-block pad-indent" data-wl-senseid="ID_00015719_12"><p class="def-head semi-flush"><span class="def-info"><span class="epp-xref C2">C2</span> <span class="gram"><a href="https://dictionary.cambridge.org/zhs/help/codes.html">[<span class="gcs"> <span class="gc">C</span> </span>]</a></span></span> <b class="def">the <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%AE%80%E4%BD%93/people" title="people">people</a> <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%AE%80%E4%BD%93/watch" title="watching">watching</a> a <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%AE%80%E4%BD%93/performance" title="performance">performance</a>, <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%AE%80%E4%BD%93/especially" title="especially">especially</a> in a <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%AE%80%E4%BD%93/theatre" title="theatre">theatre</a></b></p><span class="def-body">
+ <span class="trans" lang="zh-Hans">观众，（尤指）剧院观众</span>
+ <div class="examp emphasized"> <span class="eg">The <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%AE%80%E4%BD%93/opera" title="opera">opera</a> <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%AE%80%E4%BD%93/play" title="played">played</a> to a <span class="b"><a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%AE%80%E4%BD%93/full" title="full">full</a>/<a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%AE%80%E4%BD%93/packed" title="packed">packed</a></span> house.</span>
+ <span class="trans" lang="zh-Hans">该歌剧演出时观众爆满。</span>
</div></span></div>
- </div>
-
- </div><div class="cols cols--half"><div class="cols__col"><div class="xref idioms">
- <h3 class="h4 txt-block txt-block--alt"><strong class="xref-title">
+ </div> </div><div class="cols cols--half"><div class="cols__col"><div class="xref idioms"><h3 class="h4 txt-block txt-block--alt"><strong class="xref-title">
习惯用语 </strong></h3>
-
<div class="item"><a href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%AE%80%E4%BD%93/get-on-like-a-house-on-fire" title="get on like a house on fire的意思"><span class="x-h"><span class="phrase">get on like a house on fire</span></span></a></div>
- <div class="item"><a href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%AE%80%E4%BD%93/get-put-your-own-house-in-order" title="get/put your own house in order的意思"><span class="x-h"><span class="phrase">get/put <span title="You can use my, your, their, etc. here" class="obj">your</span> own house in order</span></span></a></div>
+ <div class="item"><a href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%AE%80%E4%BD%93/get-put-your-own-house-in-order" title="get/put your own house in order的意思"><span class="x-h"><span class="phrase">get/put <span class="obj">your</span> own house in order</span></span></a></div>
<div class="item"><a href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%AE%80%E4%BD%93/go-all-round-the-houses" title="go (all) round the houses的意思"><span class="x-h"><span class="phrase">go (all) round the houses</span></span></a></div>
<div class="item"><a href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%AE%80%E4%BD%93/house-of-cards" title="house of cards的意思"><span class="x-h"><span class="phrase">house of cards</span></span></a></div>
- <div class="item"><a href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%AE%80%E4%BD%93/on-the-house" title="on the house的意思"><span class="x-h"><span class="phrase">on the house</span></span></a></div></div></div></div></div></div> <div class="entry-body__el clrd js-share-holder"><div class="pos-header">
- <div class="h3 di-title cdo-section-title-hw"><span class="headword"><span class="hw">house</span></span>
- <span class="posgram ico-bg"><span class="pos" title="A word that describes an action, condition or experience.">verb</span> <span class="gram"><a href="https://dictionary.cambridge.org/zhs/help/codes.html">[<span class="gcs"> <span title="Transitive verb: a verb that has an object." class="gc">T</span> </span>]</a></span></span>
+ <div class="item"><a href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%AE%80%E4%BD%93/on-the-house" title="on the house的意思"><span class="x-h"><span class="phrase">on the house</span></span></a></div></div></div></div></div></div> <div class="entry-body__el clrd js-share-holder"><div class="pos-header"><div class="h3 di-title cdo-section-title-hw"><span class="headword"><span class="hw">house</span></span>
+ <span class="posgram ico-bg"><span class="pos" title="A word that describes an action, condition or experience.">verb</span> <span class="gram"><a href="https://dictionary.cambridge.org/zhs/help/codes.html">[<span class="gcs"> <span class="gc">T</span> </span>]</a></span></span>
</div>
- <span class="pron-info"><span class="uk"><span class="region">uk</span>
- <span title="house: listen to British English pronunciation" data-src-mp3="https://dictionary.cambridge.org/zhs/media/english-chinese-simplified/uk_pron/u/ukh/ukhot/ukhotfo024.mp3" data-src-ogg="https://dictionary.cambridge.org/zhs/media/english-chinese-simplified/uk_pron_ogg/u/ukh/ukhot/ukhotfo024.ogg" class="circle circle-btn sound audio_play_button uk">
+ <span class="uk"><span class="region">uk</span>
+ <span title="house: listen to British English pronunciation" data-src-mp3="/zhs/media/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%AE%80%E4%BD%93/uk_pron/u/ukh/ukhot/ukhotfo024.mp3" data-src-ogg="/zhs/media/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%AE%80%E4%BD%93/uk_pron_ogg/u/ukh/ukhot/ukhotfo024.ogg" class="circle circle-btn sound audio_play_button">
<i class='fcdo fcdo-volume-up'>​</i>
</span>
- </span>
- <span class="uk"><span class="pron">/<span class="ipa">haʊz</span>/</span></span>
- </span><span class="pron-info"><span class="us"><span class="region">us</span>
- <span title="house: listen to American pronunciation" data-src-mp3="https://dictionary.cambridge.org/zhs/media/english-chinese-simplified/us_pron/u/usz/uszzz/uszzzzc071.mp3" data-src-ogg="https://dictionary.cambridge.org/zhs/media/english-chinese-simplified/us_pron_ogg/u/usz/uszzz/uszzzzc071.ogg" class="circle circle-btn sound audio_play_button us">
+ <span class="pron">/<span class="ipa">haʊz</span>/</span> </span><span class="us"><span class="region">us</span>
+ <span title="house: listen to American pronunciation" data-src-mp3="/zhs/media/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%AE%80%E4%BD%93/us_pron/u/usz/uszzz/uszzzzc071.mp3" data-src-ogg="/zhs/media/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%AE%80%E4%BD%93/us_pron_ogg/u/usz/uszzz/uszzzzc071.ogg" class="circle circle-btn sound audio_play_button">
<i class='fcdo fcdo-volume-up'>​</i>
</span>
- </span>
- <span class="uk"><span class="pron">/<span class="ipa">haʊz</span>/</span></span>
- </span>
+ <span class="pron">/<span class="ipa">haʊz</span>/</span> </span>
<div class="share rounded js-share">
<span class="point"></span>
@@ -1131,9 +1147,6 @@ <h3 class="h4 txt-block txt-block--alt"><strong class="xref-title">
</a>
<a class="circle bg--di socialShareLink" title="在Diigo上分享该词条" href='https://www.diigo.com/post?url=https%3A%2F%2Fdictionary.cambridge.org%2Fzhs%2F%25E8%25AF%258D%25E5%2585%25B8%2F%25E8%258B%25B1%25E8%25AF%25AD-%25E6%25B1%2589%25E8%25AF%25AD-%25E7%25AE%2580%25E4%25BD%2593%2Fhouse&title=house%E6%B1%89%E8%AF%AD%28%E7%AE%80%E4%BD%93%29%E7%BF%BB%E8%AF%91%EF%BC%9A%E5%89%91%E6%A1%A5%E8%AF%8D%E5%85%B8' target='_blank' data-social='diigo' data-url='https://www.diigo.com/post?url=https%3A%2F%2Fdictionary.cambridge.org%2Fzhs%2F%25E8%25AF%258D%25E5%2585%25B8%2F%25E8%258B%25B1%25E8%25AF%25AD-%25E6%25B1%2589%25E8%25AF%25AD-%25E7%25AE%2580%25E4%25BD%2593%2Fhouse&title=house%E6%B1%89%E8%AF%AD%28%E7%AE%80%E4%BD%93%29%E7%BF%BB%E8%AF%91%EF%BC%9A%E5%89%91%E6%A1%A5%E8%AF%8D%E5%85%B8' data-object='entry'>
<i class="fcdo fcdo-diigo" aria-hidden="true"></i>
- </a>
- <a class="circle bg--su socialShareLink" title="在StumbleUpon上分享该词条" href='https://www.stumbleupon.com/likecontent?url=https%3A%2F%2Fdictionary.cambridge.org%2Fzhs%2F%25E8%25AF%258D%25E5%2585%25B8%2F%25E8%258B%25B1%25E8%25AF%25AD-%25E6%25B1%2589%25E8%25AF%25AD-%25E7%25AE%2580%25E4%25BD%2593%2Fhouse&title=house%E6%B1%89%E8%AF%AD%28%E7%AE%80%E4%BD%93%29%E7%BF%BB%E8%AF%91%EF%BC%9A%E5%89%91%E6%A1%A5%E8%AF%8D%E5%85%B8' target='_blank' data-social='stumbleupon' data-url='https://www.stumbleupon.com/likecontent?url=https%3A%2F%2Fdictionary.cambridge.org%2Fzhs%2F%25E8%25AF%258D%25E5%2585%25B8%2F%25E8%258B%25B1%25E8%25AF%25AD-%25E6%25B1%2589%25E8%25AF%25AD-%25E7%25AE%2580%25E4%25BD%2593%2Fhouse&title=house%E6%B1%89%E8%AF%AD%28%E7%AE%80%E4%BD%93%29%E7%BF%BB%E8%AF%91%EF%BC%9A%E5%89%91%E6%A1%A5%E8%AF%8D%E5%85%B8' data-object='entry'>
- <i class="fcdo fcdo-stumbleupon" aria-hidden="true"></i>
</a>
<a class="circle bg--tu socialShareLink" title="在Tumblr上分享该词条" href='https://www.tumblr.com/share/link?url=https%3A%2F%2Fdictionary.cambridge.org%2Fzhs%2F%25E8%25AF%258D%25E5%2585%25B8%2F%25E8%258B%25B1%25E8%25AF%25AD-%25E6%25B1%2589%25E8%25AF%25AD-%25E7%25AE%2580%25E4%25BD%2593%2Fhouse&name=house%E6%B1%89%E8%AF%AD%28%E7%AE%80%E4%BD%93%29%E7%BF%BB%E8%AF%91%EF%BC%9A%E5%89%91%E6%A1%A5%E8%AF%8D%E5%85%B8' target='_blank' data-social='tumblr' data-url='https://www.tumblr.com/share/link?url=https%3A%2F%2Fdictionary.cambridge.org%2Fzhs%2F%25E8%25AF%258D%25E5%2585%25B8%2F%25E8%258B%25B1%25E8%25AF%25AD-%25E6%25B1%2589%25E8%25AF%25AD-%25E7%25AE%2580%25E4%25BD%2593%2Fhouse&name=house%E6%B1%89%E8%AF%AD%28%E7%AE%80%E4%BD%93%29%E7%BF%BB%E8%AF%91%EF%BC%9A%E5%89%91%E6%A1%A5%E8%AF%8D%E5%85%B8' data-object='entry'>
<i class="fcdo fcdo-tumblr" aria-hidden="true"></i>
@@ -1148,32 +1161,21 @@ <h3 class="h4 txt-block txt-block--alt"><strong class="xref-title">
</div>
</div><div class="pos-body">
- <div class="sense-block" id="english-chinese-simplified-1-2-1">
- <div class="sense-body">
- <div class="def-block pad-indent" data-wl-senseid="ID_00015719_18"><p class="def-head semi-flush"><span class="def-info"><span title="C2: Proficiency level. English Vocabulary Profile symbols A1-C2 show which words and phrases learners know at each level." class="epp-xref C2">C2</span> </span><b class="def">to give a <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%AE%80%E4%BD%93/person" title="person">person</a> or <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%AE%80%E4%BD%93/animal" title="animal">animal</a> a <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%AE%80%E4%BD%93/place" title="place">place</a> to <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%AE%80%E4%BD%93/live" title="live">live</a>, or to <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%AE%80%E4%BD%93/provide" title="provide">provide</a> <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%AE%80%E4%BD%93/space" title="space">space</a> for something</b></p><span class="def-body">
- <span class="trans" lang="zh-Hans">
-
- 为…提供住处，收容；为…提供空间</span>
- <div class="examp emphasized"> <span title="Example" class="eg">It will be <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%AE%80%E4%BD%93/difficult" title="difficult">difficult</a> to house all the <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%AE%80%E4%BD%93/refugee" title="refugees">refugees</a>.</span>
- <span class="trans" lang="zh-Hans">
-
- 收容所有的难民将会很困难。</span>
- </div><div class="examp emphasized"> <span title="Example" class="eg">The <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%AE%80%E4%BD%93/museum" title="museum">museum</a> houses the <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%AE%80%E4%BD%93/big" title="biggest">biggest</a> <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%AE%80%E4%BD%93/collection" title="collection">collection</a> of <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%AE%80%E4%BD%93/antique" title="antique">antique</a> <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%AE%80%E4%BD%93/toy" title="toys">toys</a> in <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%AE%80%E4%BD%93/europe" title="Europe">Europe</a>.</span>
- <span class="trans" lang="zh-Hans">
-
- 这家博物馆所收藏的古董玩具是全欧洲最多的。</span>
+ <div class="sense-block" id="english-chinese-simplified-1-2-1"> <div class="sense-body">
+ <div class="def-block pad-indent" data-wl-senseid="ID_00015719_18"><p class="def-head semi-flush"><span class="def-info"><span class="epp-xref C2">C2</span> </span><b class="def">to give a <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%AE%80%E4%BD%93/person" title="person">person</a> or <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%AE%80%E4%BD%93/animal" title="animal">animal</a> a <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%AE%80%E4%BD%93/place" title="place">place</a> to <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%AE%80%E4%BD%93/live" title="live">live</a>, or to <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%AE%80%E4%BD%93/provide" title="provide">provide</a> <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%AE%80%E4%BD%93/space" title="space">space</a> for something</b></p><span class="def-body">
+ <span class="trans" lang="zh-Hans">为…提供住处，收容；为…提供空间</span>
+ <div class="examp emphasized"> <span class="eg">It will be <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%AE%80%E4%BD%93/difficult" title="difficult">difficult</a> to house all the <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%AE%80%E4%BD%93/refugee" title="refugees">refugees</a>.</span>
+ <span class="trans" lang="zh-Hans">收容所有的难民将会很困难。</span>
+ </div><div class="examp emphasized"> <span class="eg">The <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%AE%80%E4%BD%93/museum" title="museum">museum</a> houses the <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%AE%80%E4%BD%93/big" title="biggest">biggest</a> <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%AE%80%E4%BD%93/collection" title="collection">collection</a> of <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%AE%80%E4%BD%93/antique" title="antique">antique</a> <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%AE%80%E4%BD%93/toy" title="toys">toys</a> in <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%AE%80%E4%BD%93/europe" title="Europe">Europe</a>.</span>
+ <span class="trans" lang="zh-Hans">这家博物馆所收藏的古董玩具是全欧洲最多的。</span>
</div></span></div>
<div class="extraexamps"><p class="accord-basic js-accord accord-basic--shallow">更多范例</p><ul class="unstyled emphasized pad-indent"><li class="eg">The world's <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%AE%80%E4%BD%93/finest" title="finest">finest</a> <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%AE%80%E4%BD%93/collection" title="collection">collection</a> of <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%AE%80%E4%BD%93/impressionist" title="Impressionist">Impressionist</a> <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%AE%80%E4%BD%93/painting" title="paintings">paintings</a> is housed in the Musée d'Orsay in Paris.</li><li class="eg">Military <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%AE%80%E4%BD%93/bases" title="bases">bases</a> were <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%AE%80%E4%BD%93/protect" title="protected">protected</a> by <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%AE%80%E4%BD%93/capture" title="captured">captured</a> <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%AE%80%E4%BD%93/enemy" title="enemy">enemy</a> <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%AE%80%E4%BD%93/soldier" title="soldiers">soldiers</a> who were housed there as a <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%AE%80%E4%BD%93/human" title="human">human</a> <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%AE%80%E4%BD%93/shield" title="shield">shield</a>.</li><li class="eg">Hostels are usually <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%AE%80%E4%BD%93/provide" title="provided">provided</a> as a <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%AE%80%E4%BD%93/stopgap" title="stopgap">stopgap</a> until the <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%AE%80%E4%BD%93/family" title="families">families</a> can be housed in <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%AE%80%E4%BD%93/permanent" title="permanent">permanent</a> <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%AE%80%E4%BD%93/accommodation" title="accommodation">accommodation</a>.</li><li class="eg">New <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%AE%80%E4%BD%93/arrival" title="arrivals">arrivals</a> were being housed in <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%AE%80%E4%BD%93/refugee" title="refugee">refugee</a> <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%AE%80%E4%BD%93/camp" title="camps">camps</a>.</li><li class="eg">We <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%AE%80%E4%BD%93/aim" title="aim">aim</a> to house <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%AE%80%E4%BD%93/student" title="students">students</a> with <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%AE%80%E4%BD%93/local" title="local">local</a> <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%AE%80%E4%BD%93/family" title="families">families</a>.</li></ul></div>
- </div>
-
- </div></div></div></div></div></div></div>
+ </div> </div></div></div></div></div></div><div class="definition-src"><p><small>
+ (house在<a href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%AE%80%E4%BD%93/" title="剑桥英语 - 汉语（简体）词典" class="a--rev"><b>剑桥英语 - 汉语（简体）词典</b></a>的翻译 © Cambridge University Press)
+ </small></p></div></div>
</div>
- <div class="definition-src"><p><small>
- (house在<a href='https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%AE%80%E4%BD%93/' title='剑桥英语 - 汉语（简体）词典' class='a--rev'><b>剑桥英语 - 汉语（简体）词典</b></a>的翻译 ©剑桥大学出版社)
- </small></p></div>
-
<div class="clrd mod mod--style5 mod--dark mod-translate">
<div class="pad mod-translate__lang bg-h round-right-aft" id="translations">
<div><h2 class="h3">“house”的翻译</h2></div>
@@ -1184,15 +1186,20 @@ <h3 class="h4 txt-block txt-block--alt"><strong class="xref-title">
<div id="cdo-translation-opt" class="dropdown__box rounded">
<ul class="unstyled">
<li><a href="#" data-dataset="english-chinese-traditional">在汉语（繁体）中</a></li>
+ <li><a href="#" data-dataset="english-french">在法语中</a></li>
<li><a href="#" data-dataset="english-japanese">在日语中</a></li>
<li><a href="#" data-dataset="english-catalan">在加泰罗尼亚语中</a></li>
<li><a href="#" data-dataset="english-arabic">在阿拉伯语中</a></li>
+ <li><a href="#" data-dataset="english-danish">in Danish</a></li>
+ <li><a href="#" data-dataset="english-czech">in Czech</a></li>
<li><a href="#" data-dataset="english-indonesian">在印尼语中</a></li>
- <li><a href="#" data-dataset="english-thai">在泰语中</a></li>
<li><a href="#" data-dataset="english-vietnamese">在越南语中</a></li>
+ <li><a href="#" data-dataset="english-thai">在泰语中</a></li>
<li><a href="#" data-dataset="english-polish">在波兰语中</a></li>
<li><a href="#" data-dataset="english-malaysian">在马来语中</a></li>
<li><a href="#" data-dataset="turkish">在土耳其语中</a></li>
+ <li><a href="#" data-dataset="english-german">在德语中</a></li>
+ <li><a href="#" data-dataset="english-norwegian">in Norwegian</a></li>
<li><a href="#" data-dataset="english-korean">在韩语中</a></li>
<li><a href="#" data-dataset="english-portuguese">在葡萄牙语中</a></li>
<li><a href="#" data-dataset="english-italian">在意大利语中</a></li>
@@ -1208,6 +1215,12 @@ <h3 class="h4 txt-block txt-block--alt"><strong class="xref-title">
<span class="point"></span>
<p class="flush">家, 房屋，住宅, 住在一間房子裡的人…</p>
</a>
+ </li>
+ <li data-dataset="english-french">
+ <a href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B3%95%E8%AF%AD/house" title="house：法语翻译" class="helper ico-bg-abs ico-bg--arrow-end">
+ <span class="point"></span>
+ <p class="flush">maison, maisonnée, Chambre…</p>
+ </a>
</li>
<li data-dataset="english-japanese">
<a href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%97%A5%E8%AF%AD/house" title="house：日语翻译" class="helper ico-bg-abs ico-bg--arrow-end">
@@ -1227,16 +1240,22 @@ <h3 class="h4 txt-block txt-block--alt"><strong class="xref-title">
<p class="flush">بَيْت…</p>
</a>
</li>
- <li data-dataset="english-indonesian">
- <a href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E5%8D%B0%E5%BA%A6%E5%B0%BC%E8%A5%BF%E4%BA%9A%E8%AF%AD/house_2" title="house：印尼语翻译" class="helper ico-bg-abs ico-bg--arrow-end">
+ <li data-dataset="english-danish">
+ <a href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E4%B8%B9%E9%BA%A6%E8%AF%AD/house" title="house: Danish translation" class="helper ico-bg-abs ico-bg--arrow-end">
<span class="point"></span>
- <p class="flush">menyimpan…</p>
+ <p class="flush">hus, -hus, teaterbygning…</p>
</a>
</li>
- <li data-dataset="english-thai">
- <a href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B3%B0%E8%AF%AD/house_2" title="house：泰语翻译" class="helper ico-bg-abs ico-bg--arrow-end">
+ <li data-dataset="english-czech">
+ <a href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%8D%B7%E5%85%8B%E8%AF%AD/house" title="house: Czech translation" class="helper ico-bg-abs ico-bg--arrow-end">
<span class="point"></span>
- <p class="flush">เก็บ…</p>
+ <p class="flush">dům, kurník, hostinec…</p>
+ </a>
+ </li>
+ <li data-dataset="english-indonesian">
+ <a href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E5%8D%B0%E5%BA%A6%E5%B0%BC%E8%A5%BF%E4%BA%9A%E8%AF%AD/house_2" title="house：印尼语翻译" class="helper ico-bg-abs ico-bg--arrow-end">
+ <span class="point"></span>
+ <p class="flush">menyimpan…</p>
</a>
</li>
<li data-dataset="english-vietnamese">
@@ -1244,6 +1263,12 @@ <h3 class="h4 txt-block txt-block--alt"><strong class="xref-title">
<span class="point"></span>
<p class="flush">ở, trú…</p>
</a>
+ </li>
+ <li data-dataset="english-thai">
+ <a href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B3%B0%E8%AF%AD/house_2" title="house：泰语翻译" class="helper ico-bg-abs ico-bg--arrow-end">
+ <span class="point"></span>
+ <p class="flush">เก็บ…</p>
+ </a>
</li>
<li data-dataset="english-polish">
<a href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B3%A2%E5%85%B0%E8%AF%AD/house_1" title="house：波兰语翻译" class="helper ico-bg-abs ico-bg--arrow-end">
@@ -1262,6 +1287,18 @@ <h3 class="h4 txt-block txt-block--alt"><strong class="xref-title">
<span class="point"></span>
<p class="flush">ev, ev halkı, iş/faaliyet yapılan yer…</p>
</a>
+ </li>
+ <li data-dataset="english-german">
+ <a href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E5%BE%B7%E8%AF%AD/house" title="house：德语翻译" class="helper ico-bg-abs ico-bg--arrow-end">
+ <span class="point"></span>
+ <p class="flush">das Haus, das Geschlecht, unterbringen…</p>
+ </a>
+ </li>
+ <li data-dataset="english-norwegian">
+ <a href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%8C%AA%E5%A8%81%E8%AF%AD/house" title="house: Norwegian translation" class="helper ico-bg-abs ico-bg--arrow-end">
+ <span class="point"></span>
+ <p class="flush">hus, hjem, bolig…</p>
+ </a>
</li>
<li data-dataset="english-korean">
<a href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E9%9F%A9%E8%AF%AD/house" title="house：韩语翻译" class="helper ico-bg-abs ico-bg--arrow-end">
@@ -1303,23 +1340,7 @@ <h3 class="h4 txt-block txt-block--alt"><strong class="xref-title">
</div>
</div>
- </div>
- <div class="clrd">
- <div class="mod float-xl">
-
- <div id='ad_btmslot_a' class='am-default '>
- <script type='text/javascript'>
- googletag.cmd.push(function() { googletag.display('ad_btmslot_a'); });
- </script>
- </div>
-
- <div id='ad_houseslot_b' class='am-default '>
- <script type='text/javascript'>
- googletag.cmd.push(function() { googletag.display('ad_houseslot_b'); });
- </script>
- </div>
- </div>
</div>
<div class="clrd">
@@ -1331,32 +1352,48 @@ <h3 class="h4 txt-block txt-block--alt"><strong class="xref-title">
<div class="oflow-hide scroller scroller--blur js-scroller grad-trans-pseudo">
<div class="scroller__content js-scroller-content">
<ul class="unstyled a--b a--rev a--alt">
- <li>
- <a href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%AE%80%E4%BD%93/hour-long" title="hour-long"><span class="entry_title"><span class="results"><span class="base"><b class="hw">hour-long</b></span></span></span></a>
+ <li>
+ <a href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%AE%80%E4%BD%93/hour-long" title="hour-long">
+ <span class="entry_title"><span class="results"><span class="base"><b class="hw">hour-long</b></span></span></span>
+ </a>
</li>
- <li>
- <a href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%AE%80%E4%BD%93/hourglass" title="hourglass"><span class="entry_title"><span class="results"><span class="base"><b class="hw">hourglass</b></span></span></span></a>
+ <li>
+ <a href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%AE%80%E4%BD%93/hourglass" title="hourglass">
+ <span class="entry_title"><span class="results"><span class="base"><b class="hw">hourglass</b></span></span></span>
+ </a>
</li>
- <li>
- <a href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%AE%80%E4%BD%93/hourglass-figure" title="hourglass figure"><span class="entry_title"><span class="results"><span class="base"><b class="hw">hourglass figure</b></span></span></span></a>
+ <li>
+ <a href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%AE%80%E4%BD%93/hourglass-figure" title="hourglass figure">
+ <span class="entry_title"><span class="results"><span class="base"><b class="hw">hourglass figure</b></span></span></span>
+ </a>
</li>
- <li>
- <a href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%AE%80%E4%BD%93/hourly" title="hourly"><span class="entry_title"><span class="results"><span class="base"><b class="hw">hourly</b></span></span></span></a>
+ <li>
+ <a href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%AE%80%E4%BD%93/hourly" title="hourly">
+ <span class="entry_title"><span class="results"><span class="base"><b class="hw">hourly</b></span></span></span>
+ </a>
</li>
- <li>
+ <li>
<span class="entry_title"><span class="results"><span class="base"><b class="hw">house</b></span></span></span>
+ </li>
+ <li>
+ <a href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%AE%80%E4%BD%93/house-arrest" title="house arrest">
+ <span class="entry_title"><span class="results"><span class="base"><b class="hw">house arrest</b></span></span></span>
+ </a>
</li>
- <li>
- <a href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%AE%80%E4%BD%93/house-arrest" title="house arrest"><span class="entry_title"><span class="results"><span class="base"><b class="hw">house arrest</b></span></span></span></a>
- </li>
- <li>
- <a href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%AE%80%E4%BD%93/house-call" title="house call"><span class="entry_title"><span class="results"><span class="base"><b class="hw">house call</b></span></span></span></a>
+ <li>
+ <a href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%AE%80%E4%BD%93/house-call" title="house call">
+ <span class="entry_title"><span class="results"><span class="base"><b class="hw">house call</b></span></span></span>
+ </a>
</li>
- <li>
- <a href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%AE%80%E4%BD%93/house-committee" title="House Committee"><span class="entry_title"><span class="results"><span class="base"><b class="hw">House Committee</b></span></span></span></a>
+ <li>
+ <a href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%AE%80%E4%BD%93/house-committee" title="House Committee">
+ <span class="entry_title"><span class="results"><span class="base"><b class="hw">House Committee</b></span></span></span>
+ </a>
</li>
- <li>
- <a href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%AE%80%E4%BD%93/house-husband" title="house husband"><span class="entry_title"><span class="results"><span class="base"><b class="hw">house husband</b></span></span></span></a>
+ <li>
+ <a href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%AE%80%E4%BD%93/house-husband" title="house husband">
+ <span class="entry_title"><span class="results"><span class="base"><b class="hw">house husband</b></span></span></span>
+ </a>
</li>
</ul>
</div>
@@ -1365,20 +1402,37 @@ <h3 class="h4 txt-block txt-block--alt"><strong class="xref-title">
</div>
</div>
+ <div class="clrd">
+ <div class="mod float-xl">
+
+ <div id='ad_btmslot_a' class='am-default '>
+ <script type='text/javascript'>
+ googletag.cmd.push(function() { googletag.display('ad_btmslot_a'); });
+ </script>
+ </div>
+
+ <div id='ad_houseslot_b' class='am-default '>
+ <script type='text/javascript'>
+ googletag.cmd.push(function() { googletag.display('ad_houseslot_b'); });
+ </script>
+ </div>
+ </div>
+ </div>
+
</div>
<div class="cdo-tpl__z cdo-tpl-main__z3 clrd">
- <div class="mod mod--dark mod--style1">
- <div class="pad">
- <p class="leader">免费创建并分享自己的单词列表和小测验！</p>
- <p>
- <a href="#" class="btn btn--impact btn--s13 js-toggle" data-target-selector="#modal-login"><b>现在就注册</b></a>
- <a href="#" class="btn btn--impact2 btn--s13 js-toggle" data-target-selector="#modal-login"><b>登录</b></a>
- </p>
+ <div class="mod mod--style1 pad">
+ <div class="pad">
+ <div class="h2 semi-flush">我的词典</div>
+ <p>免费创建并分享自己的单词列表和小测验！</p>
+ <p>
+ <a class="btn btn--white btn--s13 registerBtn btn--forbidden"><b>现在就注册</b></a>
+ <a class="btn btn--impact2 btn--s13 loginBtn btn--forbidden"><b>登录</b></a>
+ </p>
</div>
- </div>
-
+</div>
<div id='ad_rightslot' class='am-default '>
@@ -1387,104 +1441,104 @@ <h3 class="h4 txt-block txt-block--alt"><strong class="xref-title">
</script>
</div>
- <div class="mod mod--style4 mod--border">
- <h2 class="h3 txt-block txt-block--alt round-top flush">
- “house”更多的汉语(简体)翻译
- </h2>
-
- <div class="tabs tabs--block js-tabs-wrap clrd">
- <div class="tabs__tabs js-tabs">
- <ul>
-
- <li>
- <a href="#more-results" data-tab="all" class="on"
- title="“house”在英语-汉语（简体）中的全部意思">
- 全部
- </a>
- </li>
- <li>
- <a href="#more-results-idioms" data-tab="idioms"
- title="英语-汉语（简体）里“house”在惯用语中的意思">
- 惯用语
- </a>
- </li>
- </ul>
- </div>
-
- <div class="tabs__content mod-more on" data-tab="all" id="more-results">
- <div class="pad">
- <ul class="unstyled link-list results">
-
- <li>
- <a href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%AE%80%E4%BD%93/in-house" data-gaCategory="more-result" data-gaAction="more-result-link" title="in-house" class="moreResult">
- <span class='arl3'><span class="base"><b class="hw">in-house</b></span></span>
- </a>
- </li>
-
- <li>
- <a href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%AE%80%E4%BD%93/field-house" data-gaCategory="more-result" data-gaAction="more-result-link" title="field house" class="moreResult">
- <span class='arl3'><span class="base"><b class="hw">field house</b></span></span>
- </a>
- </li>
-
- <li>
- <a href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%AE%80%E4%BD%93/arthouse" data-gaCategory="more-result" data-gaAction="more-result-link" title="arthouse" class="moreResult">
- <span class='arl3'><span class="base"><b class="hw">arthouse</b></span></span>
- </a>
- </li>
-
- <li>
- <a href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%AE%80%E4%BD%93/crack-house" data-gaCategory="more-result" data-gaAction="more-result-link" title="crack house" class="moreResult">
- <span class='arl3'><span class="base"><b class="hw">crack house</b></span></span>
- </a>
- </li>
-
- <li>
- <a href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%AE%80%E4%BD%93/free-house" data-gaCategory="more-result" data-gaAction="more-result-link" title="free house" class="moreResult">
- <span class='arl3'><span class="base"><b class="hw">free house</b></span></span>
- </a>
- </li>
-
- <li>
- <a href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%AE%80%E4%BD%93/art-house" data-gaCategory="more-result" data-gaAction="more-result-link" title="art house" class="moreResult">
- <span class='arl3'><span class="base"><b class="hw">art house</b></span></span>
- </a>
- </li>
-
- <li>
- <a href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%AE%80%E4%BD%93/house-sit" data-gaCategory="more-result" data-gaAction="more-result-link" title="house-sit" class="moreResult">
- <span class='arl3'><span class="base"><b class="hw">house-sit</b></span></span>
- </a>
- </li>
- </ul>
- </div>
- <a href="https://dictionary.cambridge.org/zhs/%E6%90%9C%E7%B4%A2/english-chinese-simplified/?q=house" class="txt-block"
- title="在英语-汉语（简体）中关于house的所有意思"
- onClick="ga('send','event', 'more-result', 'see-all-meaning' );">
- <span>查看全部意思»</span> <i class="fcdo fcdo-angle-right" aria-hidden="true"></i>
- </a>
- </div>
-
-
- <div class="tabs__content mod-more" data-tab="idioms" id="more-results-idioms">
- <div class="pad">
- <ul class="unstyled link-list results">
- <li><a href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%AE%80%E4%BD%93/bring-the-house-down" title="bring the house down idiom"><span class='arl7'><span class="base"><b class="phrase">bring the house down</b></span> <span class="pos">idiom</span></span></a></li>
- <li><a href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%AE%80%E4%BD%93/house-of-cards" title="house of cards idiom"><span class='arl7'><span class="base"><b class="phrase">house of cards</b></span> <span class="pos">idiom</span></span></a></li>
- <li><a href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%AE%80%E4%BD%93/go-all-round-the-houses" title="go (all) round the houses idiom"><span class='arl7'><span class="base"><b class="phrase">go (all) round the houses</b></span> <span class="pos">idiom</span></span></a></li>
- <li><a href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%AE%80%E4%BD%93/on-the-house" title="on the house idiom"><span class='arl7'><span class="base"><b class="phrase">on the house</b></span> <span class="pos">idiom</span></span></a></li>
- <li><a href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%AE%80%E4%BD%93/get-put-your-own-house-in-order" title="get/put your own house in order idiom"><span class='arl7'><span class="base"><b class="phrase">get/put <i class="obj" title="You can use my, your, their, etc. here">your</i> own house in order</b></span> <span class="pos">idiom</span></span></a></li>
- <li><a href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%AE%80%E4%BD%93/not-a-dry-eye-in-the-house" title="not a dry eye in the house idiom"><span class='arl7'><span class="base"><b class="phrase">not a dry eye in the house</b></span> <span class="pos">idiom</span></span></a></li>
- <li><a href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%AE%80%E4%BD%93/get-on-like-a-house-on-fire" title="get on like a house on fire idiom"><span class='arl7'><span class="base"><b class="phrase">get on like a house on fire</b></span> <span class="pos">idiom</span></span></a></li>
- </ul>
- </div>
-
- <a href="https://dictionary.cambridge.org/zhs/%E6%90%9C%E7%B4%A2/english-chinese-simplified/?q=house&type=idiom" class="txt-block"
- title="在英语-汉语（简体）中关于house的所有惯用语意思">
- <span>查看全部惯用语意思»</span> <i class="fcdo fcdo-angle-right"></i>
- </a>
- </div>
- </div>
+
+ <div class="mod mod--style4 mod--border">
+ <h2 class="h3 txt-block txt-block--alt round-top flush">
+ “house”更多的汉语(简体)翻译
+ </h2>
+
+ <div class="tabs tabs--block js-tabs-wrap clrd">
+ <div class="tabs__tabs js-tabs">
+ <ul>
+ <li>
+ <a href="#more-results" data-tab="all" class="on"
+ title="“house”在英语-汉语（简体）中的全部意思">
+ 全部
+ </a>
+ </li>
+ <li>
+ <a href="#more-results-idioms" data-tab="idioms"
+ title="英语-汉语（简体）里“house”在惯用语中的意思">
+ 惯用语
+ </a>
+ </li>
+ </ul>
+ </div>
+
+ <div class="tabs__content mod-more on" data-tab="all" id="more-results">
+ <div class="pad">
+ <ul class="unstyled link-list results">
+
+ <li>
+ <a href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%AE%80%E4%BD%93/in-house" data-gaCategory="more-result" data-gaAction="more-result-link" title="in-house" class="moreResult">
+ <span class='arl3'><span class="base"><b class="hw">in-house</b></span></span>
+ </a>
+ </li>
+
+ <li>
+ <a href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%AE%80%E4%BD%93/arthouse" data-gaCategory="more-result" data-gaAction="more-result-link" title="arthouse" class="moreResult">
+ <span class='arl3'><span class="base"><b class="hw">arthouse</b></span></span>
+ </a>
+ </li>
+
+ <li>
+ <a href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%AE%80%E4%BD%93/art-house" data-gaCategory="more-result" data-gaAction="more-result-link" title="art house" class="moreResult">
+ <span class='arl3'><span class="base"><b class="hw">art house</b></span></span>
+ </a>
+ </li>
+
+ <li>
+ <a href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%AE%80%E4%BD%93/house-sit" data-gaCategory="more-result" data-gaAction="more-result-link" title="house-sit" class="moreResult">
+ <span class='arl3'><span class="base"><b class="hw">house-sit</b></span></span>
+ </a>
+ </li>
+
+ <li>
+ <a href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%AE%80%E4%BD%93/crack-house" data-gaCategory="more-result" data-gaAction="more-result-link" title="crack house" class="moreResult">
+ <span class='arl3'><span class="base"><b class="hw">crack house</b></span></span>
+ </a>
+ </li>
+
+ <li>
+ <a href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%AE%80%E4%BD%93/field-house" data-gaCategory="more-result" data-gaAction="more-result-link" title="field house" class="moreResult">
+ <span class='arl3'><span class="base"><b class="hw">field house</b></span></span>
+ </a>
+ </li>
+
+ <li>
+ <a href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%AE%80%E4%BD%93/free-house" data-gaCategory="more-result" data-gaAction="more-result-link" title="free house" class="moreResult">
+ <span class='arl3'><span class="base"><b class="hw">free house</b></span></span>
+ </a>
+ </li>
+ </ul>
+ </div>
+ <a href="https://dictionary.cambridge.org/zhs/%E6%90%9C%E7%B4%A2/english-chinese-simplified/?q=house" class="txt-block"
+ title="在英语-汉语（简体）中关于house的所有意思"
+ onClick="ga('send','event', 'more-result', 'see-all-meaning' );">
+ <span>查看全部意思»</span> <i class="fcdo fcdo-angle-right" aria-hidden="true"></i>
+ </a>
+ </div>
+
+
+ <div class="tabs__content mod-more" data-tab="idioms" id="more-results-idioms">
+ <div class="pad">
+ <ul class="unstyled link-list results">
+ <li><a href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%AE%80%E4%BD%93/get-on-like-a-house-on-fire" title="get on like a house on fire idiom"><span class='arl7'><span class="base"><b class="phrase">get on like a house on fire</b></span> <span class="pos">idiom</span></span></a></li>
+ <li><a href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%AE%80%E4%BD%93/get-put-your-own-house-in-order" title="get/put your own house in order idiom"><span class='arl7'><span class="base"><b class="phrase">get/put <i class="obj" title="You can use my, your, their, etc. here">your</i> own house in order</b></span> <span class="pos">idiom</span></span></a></li>
+ <li><a href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%AE%80%E4%BD%93/go-all-round-the-houses" title="go (all) round the houses idiom"><span class='arl7'><span class="base"><b class="phrase">go (all) round the houses</b></span> <span class="pos">idiom</span></span></a></li>
+ <li><a href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%AE%80%E4%BD%93/house-of-cards" title="house of cards idiom"><span class='arl7'><span class="base"><b class="phrase">house of cards</b></span> <span class="pos">idiom</span></span></a></li>
+ <li><a href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%AE%80%E4%BD%93/on-the-house" title="on the house idiom"><span class='arl7'><span class="base"><b class="phrase">on the house</b></span> <span class="pos">idiom</span></span></a></li>
+ <li><a href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%AE%80%E4%BD%93/bring-the-house-down" title="bring the house down idiom"><span class='arl7'><span class="base"><b class="phrase">bring the house down</b></span> <span class="pos">idiom</span></span></a></li>
+ <li><a href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%AE%80%E4%BD%93/not-a-dry-eye-in-the-house" title="not a dry eye in the house idiom"><span class='arl7'><span class="base"><b class="phrase">not a dry eye in the house</b></span> <span class="pos">idiom</span></span></a></li>
+ </ul>
+ </div>
+
+ <a href="https://dictionary.cambridge.org/zhs/%E6%90%9C%E7%B4%A2/english-chinese-simplified/?q=house&type=idiom" class="txt-block"
+ title="在英语-汉语（简体）中关于house的所有惯用语意思">
+ <span>查看全部惯用语意思»</span> <i class="fcdo fcdo-angle-right"></i>
+ </a>
+ </div>
+ </div>
</div>
@@ -1494,81 +1548,73 @@ <h2 class="h3 txt-block txt-block--alt round-top flush">
</script>
</div>
-
-<div class="mod mod--dark mod--style2 oflow-hide">
+ <div class="mod mod--dark mod--style2 oflow-hide">
<div class="pad">
<p class="h2 semi-flush alt">“每日一词”</p>
- <p class="h4 feature-w-big wotd-hw">eyeliner</p><p>a coloured substance, usually contained in a pencil, that is put in a line just above or below the eyes in order to make them look more attractive</p>
+ <p class="h4 feature-w-big wotd-hw">magical</p><p>produced by or using magic</p>
</div>
<div class="txt-block txt-block--alt with-icons js-eqh-sticky">
<div class="with-icons__content">
- <a href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E5%BC%8F%E8%8B%B1%E8%AF%AD/eyeliner" class="a--rev a--b">
+ <a href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD/magical" class="a--rev a--b">
<span>关于这个</span> <i class="fcdo fcdo-angle-right" aria-hidden="true"></i>
</a>
</div>
<div class="with-icons__icons">
- <a class="circle circle-btn socialShareLink" title="在Facebook上分享该词条" href='https://www.facebook.com/sharer.php?u=https%3A%2F%2Fdictionary.cambridge.org%2Fzhs%2F%25E8%25AF%258D%25E5%2585%25B8%2F%25E8%258B%25B1%25E5%25BC%258F%25E8%258B%25B1%25E8%25AF%25AD%2Feyeliner&t=%E2%80%9C%E6%AF%8F%E6%97%A5%E4%B8%80%E8%AF%8D%E2%80%9D' target='_blank' data-social='facebook' data-url='https://www.facebook.com/sharer.php?u=https%3A%2F%2Fdictionary.cambridge.org%2Fzhs%2F%25E8%25AF%258D%25E5%2585%25B8%2F%25E8%258B%25B1%25E5%25BC%258F%25E8%258B%25B1%25E8%25AF%25AD%2Feyeliner&t=%E2%80%9C%E6%AF%8F%E6%97%A5%E4%B8%80%E8%AF%8D%E2%80%9D' data-object='wotd'>
+ <a class="circle circle-btn socialShareLink" title="在Facebook上分享该词条" href='https://www.facebook.com/sharer.php?u=https%3A%2F%2Fdictionary.cambridge.org%2Fzhs%2F%25E8%25AF%258D%25E5%2585%25B8%2F%25E8%258B%25B1%25E8%25AF%25AD%2Fmagical&t=%E2%80%9C%E6%AF%8F%E6%97%A5%E4%B8%80%E8%AF%8D%E2%80%9D' target='_blank' data-social='facebook' data-url='https://www.facebook.com/sharer.php?u=https%3A%2F%2Fdictionary.cambridge.org%2Fzhs%2F%25E8%25AF%258D%25E5%2585%25B8%2F%25E8%258B%25B1%25E8%25AF%25AD%2Fmagical&t=%E2%80%9C%E6%AF%8F%E6%97%A5%E4%B8%80%E8%AF%8D%E2%80%9D' data-object='wotd'>
<i class="fcdo fcdo-facebook" aria-hidden="true"></i>
</a>
- <a class="circle circle-btn socialShareLink" title="用推特发送该词条" href='https://twitter.com/intent/tweet?url=https%3A%2F%2Fdictionary.cambridge.org%2Fzhs%2F%25E8%25AF%258D%25E5%2585%25B8%2F%25E8%258B%25B1%25E5%25BC%258F%25E8%258B%25B1%25E8%25AF%25AD%2Feyeliner' target='_blank' data-social='twitter' data-url='https://twitter.com/intent/tweet?url=https%3A%2F%2Fdictionary.cambridge.org%2Fzhs%2F%25E8%25AF%258D%25E5%2585%25B8%2F%25E8%258B%25B1%25E5%25BC%258F%25E8%258B%25B1%25E8%25AF%25AD%2Feyeliner' data-object='wotd'>
+ <a class="circle circle-btn socialShareLink" title="用推特发送该词条" href='https://twitter.com/intent/tweet?url=https%3A%2F%2Fdictionary.cambridge.org%2Fzhs%2F%25E8%25AF%258D%25E5%2585%25B8%2F%25E8%258B%25B1%25E8%25AF%25AD%2Fmagical' target='_blank' data-social='twitter' data-url='https://twitter.com/intent/tweet?url=https%3A%2F%2Fdictionary.cambridge.org%2Fzhs%2F%25E8%25AF%258D%25E5%2585%25B8%2F%25E8%258B%25B1%25E8%25AF%25AD%2Fmagical' data-object='wotd'>
<i class="fcdo fcdo-twitter" aria-hidden="true"></i>
</a>
- <a class="circle circle-btn socialShareLink" title="在Google+上分享该词条" href='https://plus.google.com/share?url=https%3A%2F%2Fdictionary.cambridge.org%2Fzhs%2F%25E8%25AF%258D%25E5%2585%25B8%2F%25E8%258B%25B1%25E5%25BC%258F%25E8%258B%25B1%25E8%25AF%25AD%2Feyeliner' target='_blank' data-social='google' data-url='https://plus.google.com/share?url=https%3A%2F%2Fdictionary.cambridge.org%2Fzhs%2F%25E8%25AF%258D%25E5%2585%25B8%2F%25E8%258B%25B1%25E5%25BC%258F%25E8%258B%25B1%25E8%25AF%25AD%2Feyeliner' data-object='wotd'>
+ <a class="circle circle-btn socialShareLink" title="在Google+上分享该词条" href='https://plus.google.com/share?url=https%3A%2F%2Fdictionary.cambridge.org%2Fzhs%2F%25E8%25AF%258D%25E5%2585%25B8%2F%25E8%258B%25B1%25E8%25AF%25AD%2Fmagical' target='_blank' data-social='google' data-url='https://plus.google.com/share?url=https%3A%2F%2Fdictionary.cambridge.org%2Fzhs%2F%25E8%25AF%258D%25E5%2585%25B8%2F%25E8%258B%25B1%25E8%25AF%25AD%2Fmagical' data-object='wotd'>
<i class="fcdo fcdo-google-plus" aria-hidden="true"></i>
</a>
-
-
- <a class="circle circle-btn socialShareLink" title="在StumbleUpon上分享该词条" href='https://www.stumbleupon.com/likecontent?url=https%3A%2F%2Fdictionary.cambridge.org%2Fzhs%2F%25E8%25AF%258D%25E5%2585%25B8%2F%25E8%258B%25B1%25E5%25BC%258F%25E8%258B%25B1%25E8%25AF%25AD%2Feyeliner' target='_blank' data-social='stumbleupon' data-url='https://www.stumbleupon.com/likecontent?url=https%3A%2F%2Fdictionary.cambridge.org%2Fzhs%2F%25E8%25AF%258D%25E5%2585%25B8%2F%25E8%258B%25B1%25E5%25BC%258F%25E8%258B%25B1%25E8%25AF%25AD%2Feyeliner' data-object='wotd'>
- <i class="fcdo fcdo-stumbleupon" aria-hidden="true"></i>
- </a>
</div>
</div>
</div>
<div class="cols cols--half">
-
-<div class="cols__col" >
+ <div class=" 'cols__col' " >
<div class="mod mod--border">
- <a href="https://dictionaryblog.cambridge.org/2018/05/23/out-of-the-blue-words-and-phrases-for-unexpected-events/" target="_blank" class="img">
- <img alt="Out of the blue (Words and phrases for unexpected events)" src="/zhs/rss/images/out-of-the-blue.jpg" />
+ <a href="https://dictionaryblog.cambridge.org/2018/12/19/do-help-yourself-the-language-of-party-food/" target="_blank" class="img">
+ <img alt="Do help yourself! (The language of party food)" src="/zhs/rss/images/help-yourself.jpg" />
</a>
<div class="pad">
<p class="h2 semi-flush">博客</p>
<p class="leader semi-flush">
- <a href="https://dictionaryblog.cambridge.org/2018/05/23/out-of-the-blue-words-and-phrases-for-unexpected-events/" class="a--alt a--rev" target="_blank">Out of the blue (Words and phrases for unexpected events)</a>
+ <a href="https://dictionaryblog.cambridge.org/2018/12/19/do-help-yourself-the-language-of-party-food/" class="a--alt a--rev" target="_blank">Do help yourself! (The language of party food)</a>
</p>
<p class="meta">
<small class="smaller">
- <time>May 23, 2018</time>
+ <time>December 19, 2018</time>
</small>
</p>
</div>
- <a href="https://dictionaryblog.cambridge.org/2018/05/23/out-of-the-blue-words-and-phrases-for-unexpected-events/" target="_blank" class="txt-block a--alt"><span>查看更多</span> <i class="fcdo fcdo-angle-right"></i></a>
+ <a href="https://dictionaryblog.cambridge.org/2018/12/19/do-help-yourself-the-language-of-party-food/" target="_blank" class="txt-block a--alt"><span>查看更多</span> <i class="fcdo fcdo-angle-right"></i></a>
</div>
</div>
-
-<div class="cols__col" >
+ <div class=" 'cols__col' " >
<div class="mod mod--dark mod--border mod--style3">
- <a href="https://dictionaryblog.cambridge.org/2018/05/21/new-words-21-may-2018/" target="_blank" class="img">
- <img alt="monkey dumpling noun" src="/zhs/rss/images/monkey-dumpling.jpg" />
+ <a href="https://dictionaryblog.cambridge.org/2018/12/17/new-words-17-december-2018/" target="_blank" class="img">
+ <img alt="social jetlag noun" src="/zhs/rss/images/social-jetlag.jpg" />
</a>
<div class="pad">
<p class="h2 alt semi-flush">新词</p>
<p class="h4 feature-w semi-flush nw-hw">
- <a href="https://dictionaryblog.cambridge.org/2018/05/21/new-words-21-may-2018/" class="a--alt a--rev" target="_blank">monkey dumpling noun</a>
+ <a href="https://dictionaryblog.cambridge.org/2018/12/17/new-words-17-december-2018/" class="a--alt a--rev" target="_blank">social jetlag noun</a>
</p>
<p>
- <small class="smaller"><time>May 21, 2018</time></small>
+ <small class="smaller"><time>December 17, 2018</time></small>
</p>
</div>
- <a href="https://dictionaryblog.cambridge.org/2018/05/21/new-words-21-may-2018/" target="_blank" class="txt-block txt-block--alt js-eqh-sticky">
+ <a href="https://dictionaryblog.cambridge.org/2018/12/17/new-words-17-december-2018/" target="_blank" class="txt-block txt-block--alt js-eqh-sticky">
<span>查看更多</span> <i class="fcdo fcdo-angle-right"></i>
</a>
</div>
@@ -1592,52 +1638,10 @@ <h2 class="h3 txt-block txt-block--alt round-top flush">
</article>
</div>
- <div class="modal modal--myd js-modal" id="modal-login">
-
- <div class="modal__main">
- <div class="modal__spacer">
- <div class="h1 center">登录"我的词典"</div>
- <br />
- <p>
- <a href='https://dictionary.cambridge.org/zhs/auth/socialauth?id=facebook&url=https%3A%2F%2Fdictionary.cambridge.org%2Fzhs%2F%E8%AF%8D%E5%85%B8%2F%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%AE%80%E4%BD%93%2Fhouse' class="btn btn--social bg--fb">
- <i class="fcdo fcdo-facebook" aria-hidden="true"></i> 使用Facebook账号登录 </a>
- <br />
- <a href='https://dictionary.cambridge.org/zhs/auth/socialauth?id=googleplus&url=https%3A%2F%2Fdictionary.cambridge.org%2Fzhs%2F%E8%AF%8D%E5%85%B8%2F%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%AE%80%E4%BD%93%2Fhouse' class="btn btn--social btn--right bg--gp">
- <i class="fcdo fcdo-google-plus" aria-hidden="true"></i> 使用Google+账号登录 </a>
- </p>
- </div>
- </div>
-
- <div class="modal__sidebar">
- <div class="modal__spacer">
- <div class="h2 pad-t">为什么要注册？</div>
- <ul class="checklist">
- <li>这是免费的！</li>
- <li>创建您自己的单词列表</li>
- <li>创建小测试</li>
- <li>保存收藏夹</li>
- <li>和朋友们分享</li>
- <li>个性化您的"我的词典"</li>
- </ul>
- </div>
-
- </div>
- <span class="modal__close js-toggle" data-target-selector="#modal-login">
- <i class="fcdo fcdo-close"></i>
- </span>
-
-</div>
-<div class="cdo-promo">
+ <div class="cdo-promo">
<div class="contain">
<div class="cols">
- <div class="cols__col spr-b spr--promo-search">
- <a href="https://dictionary.cambridge.org/zhs/toolbardictionary.html" title="从您的浏览器搜索">
- <span class="h4">从您的浏览器搜索</span>
- <p>只需要点击一下就可以将剑桥词典添加到您的浏览器！</p>
- </a>
- </div>
-
- <div class="cols__col spr-b spr--promo-widget">
+ <div class="cols__col spr-b spr--promo-widget">
<a href="https://dictionary.cambridge.org/zhs/freesearch.html" title="获得我们的免费小工具">
<span class="h4">获得我们的免费小工具</span>
<p>使用我们的免费搜索框部件来添加剑桥词典到您的网站。</p>
@@ -1653,6 +1657,12 @@ <h2 class="h3 txt-block txt-block--alt round-top flush">
</div>
</div>
</div>
+
+<script>
+ var gigyaAuthEnabled = true;
+ var thresholdPublic = 5;
+</script>
+
<footer id="footer" class="ftr clr">
<div class="contain">
<div class="ftr__nav">
@@ -1702,13 +1712,13 @@ <h2 class="h3 txt-block txt-block--alt round-top flush">
</a>
<a href="https://twitter.com/CambridgeWords" class="btnfeat btnfeat--tw" rel="external" target="_blank" title="关注我们！">
<i class="fcdo fcdo-twitter" aria-hidden="true"></i>
- <span>161 k</span>
+ <span>173 k</span>
<em>关注</em>
<span class="point"></span>
</a>
- <a href="https://plus.google.com/b/108790671280639180398" class="btnfeat btnfeat--gp" rel="external" target="_blank" title="分享我们！">
+ <a href="https://plus.google.com/+cambridgedictionary" class="btnfeat btnfeat--gp" rel="external" target="_blank" title="分享我们！">
<i class="fcdo fcdo-google-plus" aria-hidden="true"></i>
- <span>13.2 k</span>
+ <span>15.3 k</span>
<em>粉丝</em>
<span class="point"></span>
</a>
@@ -1719,8 +1729,6 @@ <h2 class="h3 txt-block txt-block--alt round-top flush">
</div>
</div>
</footer>
-
-
<div class="overlay js-overlay"></div>
<ul class="unstyled notification banner"></ul>
@@ -1760,15 +1768,14 @@ <h2 class="h3 txt-block txt-block--alt round-top flush">
&noscript=1"/>
</noscript>
<!-- End Facebook Pixel Code -->
- <script type="text/javascript" src="/zhs/notification/notifications.js?version=3.1.126&url=%2Fdictionary%2Fenglish-chinese-simplified%2Fhouse"></script>
- <script type="text/javascript" src="/zhs/common.js?version=3.1.126"></script>
+ <script>var NOTIFICATION_COOKIE = "notifications";var notifications = [];</script>
+ <script type="text/javascript" src="/zhs/common.js?version=4.0.64"></script>
<script type='text/javascript'>
var aBk = true;
</script>
-<script type='text/javascript' src="/zhs/ads.min.js?version=3.1.126" ></script>
-
+<script type='text/javascript' src="/zhs/external/scripts/ads.min.js?version=4.0.64" ></script>
<script type='text/javascript'>
ga('send','event','aBk','aBk',''+aBk,{'nonInteraction':1});
@@ -1811,5 +1818,6 @@ <h2 class="h3 txt-block txt-block--alt round-top flush">
}
})();
</script>
- </body>
+ <script type="text/javascript" async="async" src="https://cdns.eu1.gigya.com/js/gigya.js?apiKey=3_1Rly-IzDTFvKO75hiQQbkpInsqcVx6RBnqVUozkm1OVH_QRzS-xI3Cwj7qq7hWv5"></script>
+ </body>
</html>
diff --git a/test/specs/components/dictionaries/cambridge/response/love.html b/test/specs/components/dictionaries/cambridge/response/love.html
index e81504084..a0f38ca01 100644
--- a/test/specs/components/dictionaries/cambridge/response/love.html
+++ b/test/specs/components/dictionaries/cambridge/response/love.html
@@ -1,22 +1,24 @@
<!DOCTYPE html>
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="zh-Hans" lang="zh-Hans">
<head>
- <title>love Meaning in the Cambridge English Dictionary</title>
+ <title>LOVE在剑桥英语词典中的解释及翻译</title>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
- <meta name="description" content="love definition: 1. to like another adult very much and be romantically and sexually attracted to them, or to have strong feelings of liking a friend or person in your family: 2. to like something very much: 3. used, often in requests, to say that you would very much like something: . Learn more." />
- <meta name="keywords" content="love definition, dictionary, english, british, american, business, british english, thesaurus, define love, love meaning, what is love, spelling, conjugation, audio pronunciation, free, online, english." />
+ <meta name="description" content="love的意思、解释及翻译：1. to like another adult very much and be romantically and sexually attracted to them, or to have strong feelings of liking a friend or person in your family: 2. to like something very much: 3. used, often in requests, to say that you would very much like something: 。了解更多。" />
+ <meta name="keywords" content="love，解释，词典，英语，英式，美式，商务，英式英语，同义词词典，解释love，love意思，什么是love，拼写，词形变化，音频发音，免费，在线，英语。" />
<meta http-equiv="X-UA-Compatible" content="IE=edge" />
<meta name='viewport' content='width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no' />
- <link rel="canonical" href="https://dictionary.cambridge.org/dictionary/english/love" />
- <meta property="og:url" content="https://dictionary.cambridge.org/dictionary/english/love" />
+
+ <link rel="canonical" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD/love" />
+ <meta property="og:url" content="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD/love" />
+
<link rel="alternate" hreflang="en" href="https://dictionary.cambridge.org/dictionary/english/love"/>
<link rel="alternate" hreflang="en-US" href="https://dictionary.cambridge.org/us/dictionary/english/love"/>
<link rel="alternate" hreflang="en-MX" href="https://dictionary.cambridge.org/us/dictionary/english/love"/>
@@ -25,6 +27,7 @@
<link rel="alternate" hreflang="en-CO" href="https://dictionary.cambridge.org/us/dictionary/english/love"/>
<link rel="alternate" hreflang="es" href="https://dictionary.cambridge.org/es/diccionario/ingles/love"/>
<link rel="alternate" hreflang="es-ES" href="https://dictionary.cambridge.org/es/diccionario/ingles/love"/>
+ <link rel="alternate" hreflang="es-419" href="https://dictionary.cambridge.org/es-LA/dictionary/english/love"/>
<link rel="alternate" hreflang="ru" href="https://dictionary.cambridge.org/ru/%D1%81%D0%BB%D0%BE%D0%B2%D0%B0%D1%80%D1%8C/%D0%B0%D0%BD%D0%B3%D0%BB%D0%B8%D0%B9%D1%81%D0%BA%D0%B8%D0%B9/love"/>
<link rel="alternate" hreflang="pt" href="https://dictionary.cambridge.org/pt/dicionario/ingles/love"/>
<link rel="alternate" hreflang="pt-BR" href="https://dictionary.cambridge.org/pt/dicionario/ingles/love"/>
@@ -33,39 +36,38 @@
<link rel="alternate" hreflang="it" href="https://dictionary.cambridge.org/it/dizionario/inglese/love"/>
<link rel="alternate" hreflang="zh-Hans" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD/love"/>
<link rel="alternate" hreflang="zh-Hant" href="https://dictionary.cambridge.org/zht/%E8%A9%9E%E5%85%B8/%E8%8B%B1%E8%AA%9E/love"/>
+ <link rel="alternate" hreflang="pl" href="https://dictionary.cambridge.org/pl/dictionary/english/love"/>
<link rel="alternate" hreflang="ko" href="https://dictionary.cambridge.org/ko/%EC%82%AC%EC%A0%84/%EC%98%81%EC%96%B4/love"/>
<link rel="alternate" hreflang="tr" href="https://dictionary.cambridge.org/tr/s%C3%B6zl%C3%BCk/ingilizce/love"/>
<link rel="alternate" hreflang="ja" href="https://dictionary.cambridge.org/ja/dictionary/english/love"/>
<link rel="alternate" hreflang="vi" href="https://dictionary.cambridge.org/vi/dictionary/english/love"/>
- <link rel="amphtml" href="https://dictionary.cambridge.org/amp/english/love" />
+ <link rel="amphtml" href="https://dictionary.cambridge.org/zhs/amp/%E8%8B%B1%E8%AF%AD/love" />
- <link href="https://dictionary.cambridge.org/gadgets/british/opensearch.xml" title="Cambridge Dictionary" type="application/opensearchdescription+xml" rel="search"/>
- <meta name="google-site-verification" content="lg0qcRkaLtMeKJcXsOLoptzK-2MIRJzuEtiYHZf_O2Y" />
+ <meta name="google-site-verification" content="lg0qcRkaLtMeKJcXsOLoptzK-2MIRJzuEtiYHZf_O2Y" />
- <link href="/common.css?version=3.1.126" rel="stylesheet" type="text/css" />
+ <link href="/zhs/common.css?version=4.0.64" rel="stylesheet" type="text/css" />
- <noscript>
- <style>
- .nojs-hide { display: none; }
- </style>
- </noscript>
+ <noscript>
+ <style>
+ .nojs-hide { display: none; }
+ </style>
+ </noscript>
- <link rel="shortcut icon" type="image/x-icon" href="/external/images/favicon.ico?version=3.1.126"/>
- <link rel="apple-touch-icon-precomposed" type="image/x-icon" href="/external/images/apple-touch-icon-precomposed.png?version=3.1.126"/>
- <script>
- var dictDefaultList = "english-chinese-simplified;english-chinese-traditional;english;british-grammar";var isAuthenticated = false;
- </script>
- <script type="text/javascript">
- var adsArray = new Array();
- var pageDictCode = "english";
+ <link rel="shortcut icon" type="image/x-icon" href="/zhs/external/images/favicon.ico?version=4.0.64"/>
+ <link rel="apple-touch-icon-precomposed" type="image/x-icon" href="/zhs/external/images/apple-touch-icon-precomposed.png?version=4.0.64"/>
+
+ <script>var dictDefaultList = "english-chinese-simplified;english-chinese-traditional;english;british-grammar";var isAuthenticated = false;</script>
+ <script type="text/javascript">
+ var adsArray = new Array();
+ var pageDictCode = "english";
- // Remove hash from SocialAuth
- var link = window.location.href;
- if ("replaceState" in history && (/#$/.test(link) || /#_=_$/.test(link))) {
- history.replaceState("", document.title, window.location.pathname + window.location.search);
- }
- </script>
+ // Remove hash from SocialAuth
+ var link = window.location.href;
+ if ("replaceState" in history && (/#$/.test(link) || /#_=_$/.test(link))) {
+ history.replaceState("", document.title, window.location.pathname + window.location.search);
+ }
+ </script>
<script type='text/javascript'>
function readCookie(name) {
@@ -85,140 +87,274 @@
var pl_p = readCookie("pl_p");
</script>
- <script type='text/javascript'>
+
+
+ <script type='text/javascript'>
var pbHdSlots = [
- {code: 'ad_topslot_b', sizes: [728, 90],
- bids: [{ bidder: 'appnexus', params: { placementId: '11654157' }},
+ {code: 'ad_topslot_b', mediaTypes: { banner: { sizes: [728, 90] } },
+ bids: [{ bidder: 'rubicon', params: { accountId: '17282', siteId: '162036', zoneId: '776160' }},
+ { bidder: 'appnexus', params: { placementId: '11654157' }},
+ { bidder: 'ix', params: { siteId: '195466', size: [728, 90] }},
+ { bidder: 'openx', params: { unit: '539971080', delDomain: 'idm-d.openx.net' }},
{ bidder: 'sovrn', params: { tagid: '346693' }},
- { bidder: 'indexExchange', params: { id: '17', siteID: '195466' }},
- { bidder: 'rubicon', params: { accountId: '17282', siteId: '162036', zoneId: '776160' }},
{ bidder: 'aol', params: { placement: '6479710', network: '4832.1', server: 'adserver.adtech.de' }},
{ bidder: 'pulsepoint', params: { cf: '728X90', cp: '561262', ct: '602806' }}]},
- {code: 'ad_leftslot', sizes: [160, 600],
- bids: [{ bidder: 'appnexus', params: { placementId: '11654149' }},
+ {code: 'ad_leftslot', mediaTypes: { banner: { sizes: [160, 600] } },
+ bids: [{ bidder: 'rubicon', params: { accountId: '17282', siteId: '162036', zoneId: '776140' }},
+ { bidder: 'appnexus', params: { placementId: '11654149' }},
+ { bidder: 'ix', params: { siteId: '195464', size: [160, 600] }},
+ { bidder: 'openx', params: { unit: '539971066', delDomain: 'idm-d.openx.net' }},
{ bidder: 'sovrn', params: { tagid: '346698' }},
- { bidder: 'indexExchange', params: { id: '3', siteID: '195464' }},
- { bidder: 'rubicon', params: { accountId: '17282', siteId: '162036', zoneId: '776140' }},
{ bidder: 'aol', params: { placement: '6479703', network: '4832.1', server: 'adserver.adtech.de' }},
{ bidder: 'pulsepoint', params: { cf: '160X600', cp: '561262', ct: '602779' }}]},
- {code: 'ad_btmslot_a', sizes: [300, 250],
- bids: [{ bidder: 'appnexus', params: { placementId: '11653860' }},
+ {code: 'ad_btmslot_a', mediaTypes: { banner: { sizes: [[300, 250]] } },
+ bids: [{ bidder: 'rubicon', params: { accountId: '17282', siteId: '162036', zoneId: '776130' }},
+ { bidder: 'appnexus', params: { placementId: '11653860' }},
+ { bidder: 'ix', params: { siteId: '194852', size: [300, 250] }},
+ { bidder: 'openx', params: { unit: '539971063', delDomain: 'idm-d.openx.net' }},
{ bidder: 'sovrn', params: { tagid: '346688' }},
- { bidder: 'indexExchange', params: { id: '1', siteID: '194852' }},
- { bidder: 'rubicon', params: { accountId: '17282', siteId: '162036', zoneId: '776130' }},
{ bidder: 'aol', params: { placement: '6479718', network: '4832.1', server: 'adserver.adtech.de' }},
{ bidder: 'pulsepoint', params: { cf: '300X250', cp: '561262', ct: '602775' }}]},
- {code: 'ad_rightslot', sizes: [300, 250],
- bids: [{ bidder: 'appnexus', params: { placementId: '11654156' }},
+ {code: 'ad_rightslot', mediaTypes: { banner: { sizes: [300, 250] } },
+ bids: [{ bidder: 'rubicon', params: { accountId: '17282', siteId: '162036', zoneId: '776156' }},
+ { bidder: 'appnexus', params: { placementId: '11654156' }},
+ { bidder: 'ix', params: { siteId: '195465', size: [300, 250] }},
+ { bidder: 'openx', params: { unit: '539971079', delDomain: 'idm-d.openx.net' }},
{ bidder: 'sovrn', params: { tagid: '387232' }},
- { bidder: 'indexExchange', params: { id: '16', siteID: '195465' }},
- { bidder: 'rubicon', params: { accountId: '17282', siteId: '162036', zoneId: '776156' }},
{ bidder: 'aol', params: { placement: '6479700', network: '4832.1', server: 'adserver.adtech.de' }},
{ bidder: 'pulsepoint', params: { cf: '300X250', cp: '561262', ct: '602805' }}]},
- {code: 'ad_contentslot_1', sizes: [300, 250],
- bids: [{ bidder: 'appnexus', params: { placementId: '11654150' }},
+ {code: 'ad_contentslot_1', mediaTypes: { banner: { sizes: [[300, 250], [336, 280]] } },
+ bids: [{ bidder: 'rubicon', params: { accountId: '17282', siteId: '162036', zoneId: '776142' }},
+ { bidder: 'appnexus', params: { placementId: '11654150' }},
+ { bidder: 'ix', params: { siteId: '195452', size: [300, 250] }},
+ { bidder: 'ix', params: { siteId: '195452', size: [336, 280] }},
+ { bidder: 'openx', params: { unit: '539971067', delDomain: 'idm-d.openx.net' }},
{ bidder: 'sovrn', params: { tagid: '446383' }},
- { bidder: 'indexExchange', params: { id: '4', siteID: '195452' }},
- { bidder: 'rubicon', params: { accountId: '17282', siteId: '162036', zoneId: '776142' }},
{ bidder: 'aol', params: { placement: '6479707', network: '4832.1', server: 'adserver.adtech.de' }},
- { bidder: 'pulsepoint', params: { cf: '300X250', cp: '561262', ct: '602780' }}]}];
+ { bidder: 'aol', params: { placement: '6623862', network: '4832.1', server: 'adserver.adtech.de' }},
+ { bidder: 'pulsepoint', params: { cf: '300X250', cp: '561262', ct: '602780' }},
+ { bidder: 'pulsepoint', params: { cf: '336X280', cp: '561262', ct: '661201' }}]},
+ {code: 'ad_contentslot_2', mediaTypes: { banner: { sizes: [[300, 250], [336, 280]] } },
+ bids: [{ bidder: 'rubicon', params: { accountId: '17282', siteId: '162036', zoneId: '776144' }},
+ { bidder: 'appnexus', params: { placementId: '11654151' }},
+ { bidder: 'ix', params: { siteId: '195454', size: [300, 250] }},
+ { bidder: 'ix', params: { siteId: '195454', size: [336, 280] }},
+ { bidder: 'openx', params: { unit: '539971069', delDomain: 'idm-d.openx.net' }},
+ { bidder: 'sovrn', params: { tagid: '448834' }},
+ { bidder: 'aol', params: { placement: '6479711', network: '4832.1', server: 'adserver.adtech.de' }},
+ { bidder: 'aol', params: { placement: '6623860', network: '4832.1', server: 'adserver.adtech.de' }},
+ { bidder: 'pulsepoint', params: { cf: '300X250', cp: '561262', ct: '602784' }},
+ { bidder: 'pulsepoint', params: { cf: '336X280', cp: '561262', ct: '661202' }}]},
+ {code: 'ad_contentslot_3', mediaTypes: { banner: { sizes: [[300, 250], [336, 280]] } },
+ bids: [{ bidder: 'rubicon', params: { accountId: '17282', siteId: '162036', zoneId: '776146' }},
+ { bidder: 'appnexus', params: { placementId: '11654152' }},
+ { bidder: 'ix', params: { siteId: '195456', size: [300, 250] }},
+ { bidder: 'ix', params: { siteId: '195456', size: [336, 280] }},
+ { bidder: 'openx', params: { unit: '539971071', delDomain: 'idm-d.openx.net' }},
+ { bidder: 'sovrn', params: { tagid: '448837' }},
+ { bidder: 'aol', params: { placement: '6479725', network: '4832.1', server: 'adserver.adtech.de' }},
+ { bidder: 'aol', params: { placement: '6623861', network: '4832.1', server: 'adserver.adtech.de' }},
+ { bidder: 'pulsepoint', params: { cf: '300X250', cp: '561262', ct: '602788' }},
+ { bidder: 'pulsepoint', params: { cf: '336X280', cp: '561262', ct: '661203' }}]}];
var pbDesktopSlots = [
- {code: 'ad_topslot_b', sizes: [728, 90],
- bids: [{ bidder: 'appnexus', params: { placementId: '11654157' }},
+ {code: 'ad_topslot_b', mediaTypes: { banner: { sizes: [728, 90] } },
+ bids: [{ bidder: 'rubicon', params: { accountId: '17282', siteId: '162036', zoneId: '776160' }},
+ { bidder: 'appnexus', params: { placementId: '11654157' }},
+ { bidder: 'ix', params: { siteId: '195466', size: [728, 90] }},
+ { bidder: 'openx', params: { unit: '539971080', delDomain: 'idm-d.openx.net' }},
{ bidder: 'sovrn', params: { tagid: '346693' }},
- { bidder: 'indexExchange', params: { id: '17', siteID: '195466' }},
- { bidder: 'rubicon', params: { accountId: '17282', siteId: '162036', zoneId: '776160' }},
{ bidder: 'aol', params: { placement: '6479710', network: '4832.1', server: 'adserver.adtech.de' }},
{ bidder: 'pulsepoint', params: { cf: '728X90', cp: '561262', ct: '602806' }}]},
- {code: 'ad_leftslot', sizes: [160, 600],
- bids: [{ bidder: 'appnexus', params: { placementId: '11654149' }},
+ {code: 'ad_leftslot', mediaTypes: { banner: { sizes: [160, 600] } },
+ bids: [{ bidder: 'rubicon', params: { accountId: '17282', siteId: '162036', zoneId: '776140' }},
+ { bidder: 'appnexus', params: { placementId: '11654149' }},
+ { bidder: 'ix', params: { siteId: '195464', size: [160, 600] }},
+ { bidder: 'openx', params: { unit: '539971066', delDomain: 'idm-d.openx.net' }},
{ bidder: 'sovrn', params: { tagid: '346698' }},
- { bidder: 'indexExchange', params: { id: '3', siteID: '195464' }},
- { bidder: 'rubicon', params: { accountId: '17282', siteId: '162036', zoneId: '776140' }},
{ bidder: 'aol', params: { placement: '6479703', network: '4832.1', server: 'adserver.adtech.de' }},
{ bidder: 'pulsepoint', params: { cf: '160X600', cp: '561262', ct: '602779' }}]},
- {code: 'ad_btmslot_a', sizes: [300, 250],
- bids: [{ bidder: 'appnexus', params: { placementId: '11653860' }},
+ {code: 'ad_btmslot_a', mediaTypes: { banner: { sizes: [[300, 250]] } },
+ bids: [{ bidder: 'rubicon', params: { accountId: '17282', siteId: '162036', zoneId: '776130' }},
+ { bidder: 'appnexus', params: { placementId: '11653860' }},
+ { bidder: 'ix', params: { siteId: '194852', size: [300, 250] }},
+ { bidder: 'openx', params: { unit: '539971063', delDomain: 'idm-d.openx.net' }},
{ bidder: 'sovrn', params: { tagid: '346688' }},
- { bidder: 'indexExchange', params: { id: '1', siteID: '194852' }},
- { bidder: 'rubicon', params: { accountId: '17282', siteId: '162036', zoneId: '776130' }},
{ bidder: 'aol', params: { placement: '6479718', network: '4832.1', server: 'adserver.adtech.de' }},
{ bidder: 'pulsepoint', params: { cf: '300X250', cp: '561262', ct: '602775' }}]},
- {code: 'ad_rightslot', sizes: [300, 250],
- bids: [{ bidder: 'appnexus', params: { placementId: '11654156' }},
+ {code: 'ad_rightslot', mediaTypes: { banner: { sizes: [300, 250] } },
+ bids: [{ bidder: 'rubicon', params: { accountId: '17282', siteId: '162036', zoneId: '776156' }},
+ { bidder: 'appnexus', params: { placementId: '11654156' }},
+ { bidder: 'ix', params: { siteId: '195465', size: [300, 250] }},
+ { bidder: 'openx', params: { unit: '539971079', delDomain: 'idm-d.openx.net' }},
{ bidder: 'sovrn', params: { tagid: '387232' }},
- { bidder: 'indexExchange', params: { id: '16', siteID: '195465' }},
- { bidder: 'rubicon', params: { accountId: '17282', siteId: '162036', zoneId: '776156' }},
{ bidder: 'aol', params: { placement: '6479700', network: '4832.1', server: 'adserver.adtech.de' }},
{ bidder: 'pulsepoint', params: { cf: '300X250', cp: '561262', ct: '602805' }}]},
- {code: 'ad_contentslot_1', sizes: [300, 250],
- bids: [{ bidder: 'appnexus', params: { placementId: '11654150' }},
+ {code: 'ad_contentslot_1', mediaTypes: { banner: { sizes: [[300, 250], [336, 280]] } },
+ bids: [{ bidder: 'rubicon', params: { accountId: '17282', siteId: '162036', zoneId: '776142' }},
+ { bidder: 'appnexus', params: { placementId: '11654150' }},
+ { bidder: 'ix', params: { siteId: '195452', size: [300, 250] }},
+ { bidder: 'ix', params: { siteId: '195452', size: [336, 280] }},
+ { bidder: 'openx', params: { unit: '539971067', delDomain: 'idm-d.openx.net' }},
{ bidder: 'sovrn', params: { tagid: '446383' }},
- { bidder: 'indexExchange', params: { id: '4', siteID: '195452' }},
- { bidder: 'rubicon', params: { accountId: '17282', siteId: '162036', zoneId: '776142' }},
{ bidder: 'aol', params: { placement: '6479707', network: '4832.1', server: 'adserver.adtech.de' }},
- { bidder: 'pulsepoint', params: { cf: '300X250', cp: '561262', ct: '602780' }}]}];
+ { bidder: 'aol', params: { placement: '6623862', network: '4832.1', server: 'adserver.adtech.de' }},
+ { bidder: 'pulsepoint', params: { cf: '300X250', cp: '561262', ct: '602780' }},
+ { bidder: 'pulsepoint', params: { cf: '336X280', cp: '561262', ct: '661201' }}]},
+ {code: 'ad_contentslot_2', mediaTypes: { banner: { sizes: [[300, 250], [336, 280]] } },
+ bids: [{ bidder: 'rubicon', params: { accountId: '17282', siteId: '162036', zoneId: '776144' }},
+ { bidder: 'appnexus', params: { placementId: '11654151' }},
+ { bidder: 'ix', params: { siteId: '195454', size: [300, 250] }},
+ { bidder: 'ix', params: { siteId: '195454', size: [336, 280] }},
+ { bidder: 'openx', params: { unit: '539971069', delDomain: 'idm-d.openx.net' }},
+ { bidder: 'sovrn', params: { tagid: '448834' }},
+ { bidder: 'aol', params: { placement: '6479711', network: '4832.1', server: 'adserver.adtech.de' }},
+ { bidder: 'aol', params: { placement: '6623860', network: '4832.1', server: 'adserver.adtech.de' }},
+ { bidder: 'pulsepoint', params: { cf: '300X250', cp: '561262', ct: '602784' }},
+ { bidder: 'pulsepoint', params: { cf: '336X280', cp: '561262', ct: '661202' }}]},
+ {code: 'ad_contentslot_3', mediaTypes: { banner: { sizes: [[300, 250], [336, 280]] } },
+ bids: [{ bidder: 'rubicon', params: { accountId: '17282', siteId: '162036', zoneId: '776146' }},
+ { bidder: 'appnexus', params: { placementId: '11654152' }},
+ { bidder: 'ix', params: { siteId: '195456', size: [300, 250] }},
+ { bidder: 'ix', params: { siteId: '195456', size: [336, 280] }},
+ { bidder: 'openx', params: { unit: '539971071', delDomain: 'idm-d.openx.net' }},
+ { bidder: 'sovrn', params: { tagid: '448837' }},
+ { bidder: 'aol', params: { placement: '6479725', network: '4832.1', server: 'adserver.adtech.de' }},
+ { bidder: 'aol', params: { placement: '6623861', network: '4832.1', server: 'adserver.adtech.de' }},
+ { bidder: 'pulsepoint', params: { cf: '300X250', cp: '561262', ct: '602788' }},
+ { bidder: 'pulsepoint', params: { cf: '336X280', cp: '561262', ct: '661203' }}]}];
var pbTabletSlots = [
- {code: 'ad_topslot_b', sizes: [728, 90],
- bids: [{ bidder: 'appnexus', params: { placementId: '11654157' }},
+ {code: 'ad_topslot_b', mediaTypes: { banner: { sizes: [728, 90] } },
+ bids: [{ bidder: 'rubicon', params: { accountId: '17282', siteId: '162036', zoneId: '776160' }},
+ { bidder: 'appnexus', params: { placementId: '11654157' }},
+ { bidder: 'ix', params: { siteId: '195466', size: [728, 90] }},
+ { bidder: 'openx', params: { unit: '539971080', delDomain: 'idm-d.openx.net' }},
{ bidder: 'sovrn', params: { tagid: '346693' }},
- { bidder: 'indexExchange', params: { id: '17', siteID: '195466' }},
- { bidder: 'rubicon', params: { accountId: '17282', siteId: '162036', zoneId: '776160' }},
{ bidder: 'aol', params: { placement: '6479710', network: '4832.1', server: 'adserver.adtech.de' }},
{ bidder: 'pulsepoint', params: { cf: '728X90', cp: '561262', ct: '602806' }}]},
- {code: 'ad_btmslot_a', sizes: [300, 250],
- bids: [{ bidder: 'appnexus', params: { placementId: '11653860' }},
+ {code: 'ad_btmslot_a', mediaTypes: { banner: { sizes: [[300, 250]] } },
+ bids: [{ bidder: 'rubicon', params: { accountId: '17282', siteId: '162036', zoneId: '776130' }},
+ { bidder: 'appnexus', params: { placementId: '11653860' }},
+ { bidder: 'ix', params: { siteId: '194852', size: [300, 250] }},
+ { bidder: 'openx', params: { unit: '539971063', delDomain: 'idm-d.openx.net' }},
{ bidder: 'sovrn', params: { tagid: '346688' }},
- { bidder: 'indexExchange', params: { id: '1', siteID: '194852' }},
- { bidder: 'rubicon', params: { accountId: '17282', siteId: '162036', zoneId: '776130' }},
{ bidder: 'aol', params: { placement: '6479718', network: '4832.1', server: 'adserver.adtech.de' }},
{ bidder: 'pulsepoint', params: { cf: '300X250', cp: '561262', ct: '602775' }}]},
- {code: 'ad_rightslot', sizes: [300, 250],
- bids: [{ bidder: 'appnexus', params: { placementId: '11654156' }},
+ {code: 'ad_rightslot', mediaTypes: { banner: { sizes: [300, 250] } },
+ bids: [{ bidder: 'rubicon', params: { accountId: '17282', siteId: '162036', zoneId: '776156' }},
+ { bidder: 'appnexus', params: { placementId: '11654156' }},
+ { bidder: 'ix', params: { siteId: '195465', size: [300, 250] }},
+ { bidder: 'openx', params: { unit: '539971079', delDomain: 'idm-d.openx.net' }},
{ bidder: 'sovrn', params: { tagid: '387232' }},
- { bidder: 'indexExchange', params: { id: '16', siteID: '195465' }},
- { bidder: 'rubicon', params: { accountId: '17282', siteId: '162036', zoneId: '776156' }},
{ bidder: 'aol', params: { placement: '6479700', network: '4832.1', server: 'adserver.adtech.de' }},
{ bidder: 'pulsepoint', params: { cf: '300X250', cp: '561262', ct: '602805' }}]},
- {code: 'ad_contentslot_1', sizes: [300, 250],
- bids: [{ bidder: 'appnexus', params: { placementId: '11654150' }},
+ {code: 'ad_contentslot_1', mediaTypes: { banner: { sizes: [[300, 250], [336, 280]] } },
+ bids: [{ bidder: 'rubicon', params: { accountId: '17282', siteId: '162036', zoneId: '776142' }},
+ { bidder: 'appnexus', params: { placementId: '11654150' }},
+ { bidder: 'ix', params: { siteId: '195452', size: [300, 250] }},
+ { bidder: 'ix', params: { siteId: '195452', size: [336, 280] }},
+ { bidder: 'openx', params: { unit: '539971067', delDomain: 'idm-d.openx.net' }},
{ bidder: 'sovrn', params: { tagid: '446383' }},
- { bidder: 'indexExchange', params: { id: '4', siteID: '195452' }},
- { bidder: 'rubicon', params: { accountId: '17282', siteId: '162036', zoneId: '776142' }},
{ bidder: 'aol', params: { placement: '6479707', network: '4832.1', server: 'adserver.adtech.de' }},
- { bidder: 'pulsepoint', params: { cf: '300X250', cp: '561262', ct: '602780' }}]}];
+ { bidder: 'aol', params: { placement: '6623862', network: '4832.1', server: 'adserver.adtech.de' }},
+ { bidder: 'pulsepoint', params: { cf: '300X250', cp: '561262', ct: '602780' }},
+ { bidder: 'pulsepoint', params: { cf: '336X280', cp: '561262', ct: '661201' }}]},
+ {code: 'ad_contentslot_2', mediaTypes: { banner: { sizes: [[300, 250], [336, 280]] } },
+ bids: [{ bidder: 'rubicon', params: { accountId: '17282', siteId: '162036', zoneId: '776144' }},
+ { bidder: 'appnexus', params: { placementId: '11654151' }},
+ { bidder: 'ix', params: { siteId: '195454', size: [300, 250] }},
+ { bidder: 'ix', params: { siteId: '195454', size: [336, 280] }},
+ { bidder: 'openx', params: { unit: '539971069', delDomain: 'idm-d.openx.net' }},
+ { bidder: 'sovrn', params: { tagid: '448834' }},
+ { bidder: 'aol', params: { placement: '6479711', network: '4832.1', server: 'adserver.adtech.de' }},
+ { bidder: 'aol', params: { placement: '6623860', network: '4832.1', server: 'adserver.adtech.de' }},
+ { bidder: 'pulsepoint', params: { cf: '300X250', cp: '561262', ct: '602784' }},
+ { bidder: 'pulsepoint', params: { cf: '336X280', cp: '561262', ct: '661202' }}]},
+ {code: 'ad_contentslot_3', mediaTypes: { banner: { sizes: [[300, 250], [336, 280]] } },
+ bids: [{ bidder: 'rubicon', params: { accountId: '17282', siteId: '162036', zoneId: '776146' }},
+ { bidder: 'appnexus', params: { placementId: '11654152' }},
+ { bidder: 'ix', params: { siteId: '195456', size: [300, 250] }},
+ { bidder: 'ix', params: { siteId: '195456', size: [336, 280] }},
+ { bidder: 'openx', params: { unit: '539971071', delDomain: 'idm-d.openx.net' }},
+ { bidder: 'sovrn', params: { tagid: '448837' }},
+ { bidder: 'aol', params: { placement: '6479725', network: '4832.1', server: 'adserver.adtech.de' }},
+ { bidder: 'aol', params: { placement: '6623861', network: '4832.1', server: 'adserver.adtech.de' }},
+ { bidder: 'pulsepoint', params: { cf: '300X250', cp: '561262', ct: '602788' }},
+ { bidder: 'pulsepoint', params: { cf: '336X280', cp: '561262', ct: '661203' }}]}];
var pbMobileSlots = [
- {code: 'ad_topslot_a', sizes: [320, 50],
- bids: [{ bidder: 'appnexus', params: { placementId: '11654208' }},
+ {code: 'ad_topslot_a', mediaTypes: { banner: { sizes: [320, 50] } },
+ bids: [{ bidder: 'rubicon', params: { accountId: '17282', siteId: '162050', zoneId: '776358' }},
+ { bidder: 'appnexus', params: { placementId: '11654208' }},
+ { bidder: 'ix', params: { siteId: '195467', size: [320, 50] }},
+ { bidder: 'openx', params: { unit: '539971081', delDomain: 'idm-d.openx.net' }},
{ bidder: 'sovrn', params: { tagid: '387233' }},
- { bidder: 'indexExchange', params: { id: '18', siteID: '195467' }},
- { bidder: 'rubicon', params: { accountId: '17282', siteId: '162050', zoneId: '776358' }},
{ bidder: 'aol', params: { placement: '6479701', network: '4832.1', server: 'adserver.adtech.de' }},
{ bidder: 'pulsepoint', params: { cf: '300X250', cp: '561262', ct: '602807' }}]},
- {code: 'ad_btmslot_a', sizes: [[300, 250], [320, 50], [300, 50]],
- bids: [{ bidder: 'appnexus', params: { placementId: '11654174' }},
+ {code: 'ad_btmslot_a', mediaTypes: { banner: { sizes: [[300, 250], [320, 50], [300, 50]] } },
+ bids: [{ bidder: 'rubicon', params: { accountId: '17282', siteId: '162050', zoneId: '776336' }},
+ { bidder: 'appnexus', params: { placementId: '11654174' }},
+ { bidder: 'ix', params: { siteId: '195451', size: [300, 250] }},
+ { bidder: 'ix', params: { siteId: '195451', size: [320, 50] }},
+ { bidder: 'ix', params: { siteId: '195451', size: [300, 50] }},
+ { bidder: 'openx', params: { unit: '539971065', delDomain: 'idm-d.openx.net' }},
{ bidder: 'sovrn', params: { tagid: '446381' }},
{ bidder: 'sovrn', params: { tagid: '446382' }},
- { bidder: 'indexExchange', params: { id: '2', siteID: '195451' }},
- { bidder: 'rubicon', params: { accountId: '17282', siteId: '162050', zoneId: '776336' }},
{ bidder: 'aol', params: { placement: '6479709', network: '4832.1', server: 'adserver.adtech.de' }},
{ bidder: 'aol', params: { placement: '6479722', network: '4832.1', server: 'adserver.adtech.de' }},
{ bidder: 'aol', params: { placement: '6479720', network: '4832.1', server: 'adserver.adtech.de' }},
{ bidder: 'pulsepoint', params: { cf: '300X250', cp: '561262', ct: '602776' }},
{ bidder: 'pulsepoint', params: { cf: '300X50', cp: '561262', ct: '602777' }},
{ bidder: 'pulsepoint', params: { cf: '320X50', cp: '561262', ct: '602778' }}]},
- {code: 'ad_contentslot_1', sizes: [[300, 250], [320, 50], [300, 50]],
- bids: [{ bidder: 'appnexus', params: { placementId: '11654189' }},
+ {code: 'ad_contentslot_1', mediaTypes: { banner: { sizes: [[300, 250], [320, 100], [320, 50], [300, 50]] } },
+ bids: [{ bidder: 'rubicon', params: { accountId: '17282', siteId: '162050', zoneId: '776338' }},
+ { bidder: 'appnexus', params: { placementId: '11654189' }},
+ { bidder: 'ix', params: { siteId: '195453', size: [300, 250] }},
+ { bidder: 'ix', params: { siteId: '195453', size: [320, 100] }},
+ { bidder: 'ix', params: { siteId: '195453', size: [320, 50] }},
+ { bidder: 'ix', params: { siteId: '195453', size: [300, 50] }},
+ { bidder: 'openx', params: { unit: '539971068', delDomain: 'idm-d.openx.net' }},
{ bidder: 'sovrn', params: { tagid: '446385' }},
{ bidder: 'sovrn', params: { tagid: '446384' }},
- { bidder: 'indexExchange', params: { id: '5', siteID: '195453' }},
- { bidder: 'rubicon', params: { accountId: '17282', siteId: '162050', zoneId: '776338' }},
{ bidder: 'aol', params: { placement: '6479724', network: '4832.1', server: 'adserver.adtech.de' }},
{ bidder: 'aol', params: { placement: '6479694', network: '4832.1', server: 'adserver.adtech.de' }},
{ bidder: 'aol', params: { placement: '6479699', network: '4832.1', server: 'adserver.adtech.de' }},
{ bidder: 'pulsepoint', params: { cf: '300X250', cp: '561262', ct: '602781' }},
{ bidder: 'pulsepoint', params: { cf: '300X50', cp: '561262', ct: '602782' }},
- { bidder: 'pulsepoint', params: { cf: '320X50', cp: '561262', ct: '602783' }}]}];
+ { bidder: 'pulsepoint', params: { cf: '320X100', cp: '561262', ct: '661195' }},
+ { bidder: 'pulsepoint', params: { cf: '320X50', cp: '561262', ct: '602783' }}]},
+ {code: 'ad_contentslot_2', mediaTypes: { banner: { sizes: [[300, 250], [320, 100], [320, 50], [300, 50]] } },
+ bids: [{ bidder: 'rubicon', params: { accountId: '17282', siteId: '162050', zoneId: '776340' }},
+ { bidder: 'appnexus', params: { placementId: '11654192' }},
+ { bidder: 'ix', params: { siteId: '195455', size: [300, 250] }},
+ { bidder: 'ix', params: { siteId: '195455', size: [320, 100] }},
+ { bidder: 'ix', params: { siteId: '195455', size: [320, 50] }},
+ { bidder: 'ix', params: { siteId: '195455', size: [300, 50] }},
+ { bidder: 'openx', params: { unit: '539971070', delDomain: 'idm-d.openx.net' }},
+ { bidder: 'sovrn', params: { tagid: '448836' }},
+ { bidder: 'sovrn', params: { tagid: '448835' }},
+ { bidder: 'aol', params: { placement: '6479708', network: '4832.1', server: 'adserver.adtech.de' }},
+ { bidder: 'aol', params: { placement: '6479716', network: '4832.1', server: 'adserver.adtech.de' }},
+ { bidder: 'aol', params: { placement: '6479705', network: '4832.1', server: 'adserver.adtech.de' }},
+ { bidder: 'pulsepoint', params: { cf: '300X250', cp: '561262', ct: '602785' }},
+ { bidder: 'pulsepoint', params: { cf: '300X50', cp: '561262', ct: '602786' }},
+ { bidder: 'pulsepoint', params: { cf: '320X100', cp: '561262', ct: '661196' }},
+ { bidder: 'pulsepoint', params: { cf: '320X50', cp: '561262', ct: '602787' }}]},
+ {code: 'ad_contentslot_3', mediaTypes: { banner: { sizes: [[300, 250], [320, 100], [320, 50], [300, 50]] } },
+ bids: [{ bidder: 'rubicon', params: { accountId: '17282', siteId: '162050', zoneId: '776342' }},
+ { bidder: 'appnexus', params: { placementId: '11654195' }},
+ { bidder: 'ix', params: { siteId: '195457', size: [300, 250] }},
+ { bidder: 'ix', params: { siteId: '195457', size: [320, 100] }},
+ { bidder: 'ix', params: { siteId: '195457', size: [320, 50] }},
+ { bidder: 'ix', params: { siteId: '195457', size: [300, 50] }},
+ { bidder: 'openx', params: { unit: '539971072', delDomain: 'idm-d.openx.net' }},
+ { bidder: 'sovrn', params: { tagid: '448839' }},
+ { bidder: 'sovrn', params: { tagid: '448838' }},
+ { bidder: 'aol', params: { placement: '6479715', network: '4832.1', server: 'adserver.adtech.de' }},
+ { bidder: 'aol', params: { placement: '6479721', network: '4832.1', server: 'adserver.adtech.de' }},
+ { bidder: 'aol', params: { placement: '6479698', network: '4832.1', server: 'adserver.adtech.de' }},
+ { bidder: 'pulsepoint', params: { cf: '300X250', cp: '561262', ct: '602789' }},
+ { bidder: 'pulsepoint', params: { cf: '300X50', cp: '561262', ct: '602790' }},
+ { bidder: 'pulsepoint', params: { cf: '320X100', cp: '561262', ct: '661197' }},
+ { bidder: 'pulsepoint', params: { cf: '320X50', cp: '561262', ct: '602791' }}]}];
var pbjs = pbjs || {};
pbjs.que = pbjs.que || [];
@@ -245,14 +381,19 @@
'cap': true
}]
};
- pbjs.que.push(function() {
- pbjs.setConfig({
- priceGranularity: customGranularity,
- bidderSequence: "fixed"
- });
+ pbjsCfg = {
+ userSync: { syncsPerBidder: 50 },
+ priceGranularity: customGranularity,
+ maxRequestsPerOrigin: 1,
+ enableSendAllBids: false,
+ timeoutBuffer: 400,
+ bidderSequence: "fixed"
+ };
+ pbjs.que.push(function() {
+ pbjs.setConfig(pbjsCfg);
});
</script>
- <script type="text/javascript" src="/required.js?version=3.1.126"></script>
+ <script type="text/javascript" src="/zhs/required.js?version=4.0.64"></script>
<script type='text/javascript' async>
var pbAdUnits = getPrebidSlots(curResolution);
var googletag = googletag || {};
@@ -261,7 +402,6 @@
googletag.pubads().disableInitialLoad();
});
addPrebidAdUnits(pbAdUnits);
- setTimeout(sendPrebidServerRequest, PREBID_TIMEOUT);
var dfpSlots = {};
(function() {
@@ -280,25 +420,29 @@
dfpSlots['topslot_b'] = googletag.defineSlot('/2863368/topslot', [728, 90], 'ad_topslot_b').defineSizeMapping(mapping_topslot_b).setTargeting('vp', 'top').setTargeting('hp', 'center').setTargeting('ad_group', Adomik.randomAdGroup()).addService(googletag.pubads());
var mapping_leftslot = googletag.sizeMapping().addSize([963, 0], [160, 600]).addSize([0, 0], []).build();
dfpSlots['leftslot'] = googletag.defineSlot('/2863368/leftslot', [160, 600], 'ad_leftslot').defineSizeMapping(mapping_leftslot).setTargeting('vp', 'top').setTargeting('hp', 'left').setTargeting('ad_group', Adomik.randomAdGroup()).addService(googletag.pubads());
- var mapping_btmslot_a = googletag.sizeMapping().addSize([746, 0], [300, 250]).addSize([0, 0], [[300, 250], [320, 50], [300, 50]]).build();
- dfpSlots['btmslot_a'] = googletag.defineSlot('/2863368/btmslot', [300, 250], 'ad_btmslot_a').defineSizeMapping(mapping_btmslot_a).setTargeting('vp', 'btm').setTargeting('hp', 'center').setTargeting('ad_group', Adomik.randomAdGroup()).addService(googletag.pubads());
+ var mapping_btmslot_a = googletag.sizeMapping().addSize([746, 0], [[300, 250], 'fluid']).addSize([0, 0], [[300, 250], [320, 50], [300, 50], 'fluid']).build();
+ dfpSlots['btmslot_a'] = googletag.defineSlot('/2863368/btmslot', [[300, 250], 'fluid'], 'ad_btmslot_a').defineSizeMapping(mapping_btmslot_a).setTargeting('vp', 'btm').setTargeting('hp', 'center').setTargeting('ad_group', Adomik.randomAdGroup()).addService(googletag.pubads());
var mapping_houseslot_a = googletag.sizeMapping().addSize([963, 0], [300, 250]).addSize([0, 0], []).build();
dfpSlots['houseslot_a'] = googletag.defineSlot('/2863368/houseslot', [300, 250], 'ad_houseslot_a').defineSizeMapping(mapping_houseslot_a).setTargeting('vp', 'mid').setTargeting('hp', 'right').setTargeting('ad_group', Adomik.randomAdGroup()).addService(googletag.pubads());
var mapping_houseslot_b = googletag.sizeMapping().addSize([963, 0], []).addSize([0, 0], [300, 250]).build();
dfpSlots['houseslot_b'] = googletag.defineSlot('/2863368/houseslot', [], 'ad_houseslot_b').defineSizeMapping(mapping_houseslot_b).setTargeting('vp', 'btm').setTargeting('hp', 'center').setTargeting('ad_group', Adomik.randomAdGroup()).addService(googletag.pubads());
var mapping_rightslot = googletag.sizeMapping().addSize([746, 0], [300, 250]).addSize([0, 0], []).build();
dfpSlots['rightslot'] = googletag.defineSlot('/2863368/rightslot', [300, 250], 'ad_rightslot').defineSizeMapping(mapping_rightslot).setTargeting('vp', 'mid').setTargeting('hp', 'right').setTargeting('ad_group', Adomik.randomAdGroup()).addService(googletag.pubads());
- var mapping_contentslot = googletag.sizeMapping().addSize([746, 0], [300, 250]).addSize([0, 0], [[300, 250], [320, 50], [300, 50]]).build();
- dfpSlots['contentslot_1'] = googletag.defineSlot('/2863368/mpuslot', [300, 250], 'ad_contentslot_1').defineSizeMapping(mapping_contentslot).setTargeting('cdo_si', 1).setTargeting('vp', 'mid').setTargeting('hp', 'center').setTargeting('ad_group', Adomik.randomAdGroup()).addService(googletag.pubads());
+ var mapping_contentslot = googletag.sizeMapping().addSize([746, 0], [[300, 250], [336, 280], 'fluid']).addSize([0, 0], [[300, 250], [320, 100], [320, 50], [300, 50], 'fluid']).build();
+ dfpSlots['contentslot_1'] = googletag.defineSlot('/2863368/mpuslot', [[300, 250], [336, 280], 'fluid'], 'ad_contentslot_1').defineSizeMapping(mapping_contentslot).setTargeting('cdo_si', '1').setTargeting('vp', 'mid').setTargeting('hp', 'center').setTargeting('ad_group', Adomik.randomAdGroup()).addService(googletag.pubads());
+ dfpSlots['contentslot_2'] = googletag.defineSlot('/2863368/mpuslot', [[300, 250], [336, 280], 'fluid'], 'ad_contentslot_2').defineSizeMapping(mapping_contentslot).setTargeting('cdo_si', '2').setTargeting('vp', 'mid').setTargeting('hp', 'center').setTargeting('ad_group', Adomik.randomAdGroup()).addService(googletag.pubads());
+ dfpSlots['contentslot_3'] = googletag.defineSlot('/2863368/mpuslot', [[300, 250], [336, 280], 'fluid'], 'ad_contentslot_3').defineSizeMapping(mapping_contentslot).setTargeting('cdo_si', '3').setTargeting('vp', 'mid').setTargeting('hp', 'center').setTargeting('ad_group', Adomik.randomAdGroup()).addService(googletag.pubads());
googletag.pubads().addEventListener('slotRenderEnded', function(event) { if (!event.isEmpty && event.slot.renderCallback) { event.slot.renderCallback(event); } });
+
+ googletag.pubads().setTargeting('ad_h', Adomik.hour);
googletag.pubads().setTargeting("cdo_pc", "dictionary");
- googletag.pubads().setTargeting("cdo_pt", "entryex");
- googletag.pubads().setTargeting("cdo_ptl", "entryex-lcp");
+ googletag.pubads().setTargeting("cdo_pt", "entry");
+ googletag.pubads().setTargeting("cdo_ptl", "entry-lcp");
googletag.pubads().setTargeting("cdo_dc", "english");
googletag.pubads().setTargeting("cdo_ei", "love");
googletag.pubads().setTargeting("cdo_c", ["people_society_religion", "sports_sporting_goods", "arts_entertainment_media", "shopping_consumer_resources"]);
googletag.pubads().setTargeting("cdo_t", "liking-and-attractiveness");
- googletag.pubads().setTargeting("cdo_l", "en");
+ googletag.pubads().setTargeting("cdo_l", "zh-hans");
googletag.pubads().setTargeting("cdo_tc", "resp");
if(pl_p)
@@ -306,20 +450,21 @@
googletag.pubads().setCategoryExclusion('lcp').setCategoryExclusion('resp').setCategoryExclusion('wprod');
+
googletag.pubads().enableSingleRequest();
googletag.pubads().collapseEmptyDivs(false);
googletag.enableServices();
});
</script>
- <meta property="og:title" content="love Meaning in the Cambridge English Dictionary" />
- <meta property="og:description" content="love definition: 1. to like another adult very much and be romantically and sexually attracted to them, or to have strong feelings of liking a friend or person in your family: 2. to like something very much: 3. used, often in requests, to say that you would very much like something: . Learn more." />
- <meta property="og:image" content="/external/images/CDO_logo_120x120.jpg?version=3.1.126" />
+ <meta property="og:title" content="LOVE在剑桥英语词典中的解释及翻译" />
+ <meta property="og:description" content="love的意思、解释及翻译：1. to like another adult very much and be romantically and sexually attracted to them, or to have strong feelings of liking a friend or person in your family: 2. to like something very much: 3. used, often in requests, to say that you would very much like something: 。了解更多。" />
+ <meta property="og:image" content="https://dictionary.cambridge.org/zhs/external/images/CDO_logo_120x120.jpg" />
</head>
<body class="default_layout">
<div itemscope itemtype="http://schema.org/Product" style="display: none;">
- <span itemprop="name">love Meaning in the Cambridge English Dictionary</span>
- <a itemprop="image" href="/external/images/CDO_logo_120x120.jpg?version=3.1.126">Cambridge dictionaries logo</a>
+ <span itemprop="name">LOVE在剑桥英语词典中的解释及翻译</span>
+ <a itemprop="image" href="/zhs/external/images/CDO_logo_120x120.jpg?version=4.0.64">剑桥词典logo</a>
</div>
<div class="overlay js-nav-trig"></div>
@@ -328,117 +473,121 @@
<span class="off-canvas__close js-nav-trig"><i class="fcdo fcdo-close"></i></span>
<div class="off-canvas__pad clrd">
- <a href="https://dictionary.cambridge.org/" class="cdo-logo cdo-logo--rev hide-txt" title="Cambridge Dictionary">Cambridge Dictionary</a>
+ <a href="https://dictionary.cambridge.org/zhs/" class="cdo-logo cdo-logo--rev hide-txt" title="Cambridge Dictionary">Cambridge Dictionary</a>
</div>
<nav class="off-canvas__nav js-menu">
<ul>
<li>
- <a href="" class="js-has-sub-nav ico-bg-abs ico-bg--chevron">Dictionary</a>
+ <a href="" class="js-has-sub-nav ico-bg-abs ico-bg--chevron">词典</a>
<ul>
<li>
- <a href="" class="js-has-sub-nav ico-bg-abs ico-bg--chevron">Definitions</a>
+ <a href="" class="js-has-sub-nav ico-bg-abs ico-bg--chevron">定义</a>
<ul>
- <li><a href="https://dictionary.cambridge.org/dictionary/english">English</a></li>
- <li><a href="https://dictionary.cambridge.org/dictionary/learner-english">Learner’s Dictionary</a></li>
- <li><a href="https://dictionary.cambridge.org/dictionary/essential-british-english">Essential British English</a></li>
- <li><a href="https://dictionary.cambridge.org/dictionary/essential-american-english">Essential American English</a></li>
+ <li><a href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/english">英语</a></li>
+ <li><a href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/learner-english">学习词典</a></li>
+ <li><a href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/essential-british-english">基础英式英语</a></li>
+ <li><a href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/essential-american-english">基础美式英语</a></li>
</ul>
</li>
<li>
- <a href="" class="js-has-sub-nav ico-bg-abs ico-bg--chevron">Translations</a>
+ <a href="" class="js-has-sub-nav ico-bg-abs ico-bg--chevron">翻译</a>
<ul>
- <li class="off-canvas__nav__section"><strong>Bilinguals</strong></li>
+ <li class="off-canvas__nav__section"><strong>双语</strong></li>
<li>
- <span class="pointer js-toggle-children" data-target-selector="next" title="Change language direction"><i class="fcdo fcdo-exchange fcdo--nudge" aria-hidden="true"></i></span>
+ <span class="pointer js-toggle-children" data-target-selector="next" title="更改语言方向"><i class="fcdo fcdo-exchange fcdo--nudge" aria-hidden="true"></i></span>
<span>
- <a style="display: inline;" href="https://dictionary.cambridge.org/dictionary/english-spanish/" data-dictCode="english-spanish" title="English-Spanish Dictionary">English–Spanish</a>
- <a style="display: none;" href="https://dictionary.cambridge.org/dictionary/spanish-english/" data-dictCode="spanish-english" title="Diccionario Español-inglés">Spanish–English</a>
+ <a style="display: inline;" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E8%A5%BF%E7%8F%AD%E7%89%99%E8%AF%AD/" data-dictCode="english-spanish" title="英语-西班牙语词典">英语-西班牙语</a>
+ <a style="display: none;" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%A5%BF%E7%8F%AD%E7%89%99%E8%AF%AD-%E8%8B%B1%E8%AF%AD/" data-dictCode="spanish-english" title="西班牙语-英语词典">西班牙语-英语</a>
</span>
</li>
<li>
- <span class="pointer js-toggle-children" data-target-selector="next" title="Change language direction"><i class="fcdo fcdo-exchange fcdo--nudge" aria-hidden="true"></i></span>
+ <span class="pointer js-toggle-children" data-target-selector="next" title="更改语言方向"><i class="fcdo fcdo-exchange fcdo--nudge" aria-hidden="true"></i></span>
<span>
- <a style="display: inline;" href="https://dictionary.cambridge.org/dictionary/english-french/" data-dictCode="english-french" title="English-French Dictionary">English–French</a>
- <a style="display: none;" href="https://dictionary.cambridge.org/dictionary/french-english/" data-dictCode="french-english" title="French-English Dictionary">French–English</a>
+ <a style="display: inline;" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B3%95%E8%AF%AD/" data-dictCode="english-french" title="英语-法语词典">英语-法语</a>
+ <a style="display: none;" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E6%B3%95%E8%AF%AD-%E8%8B%B1%E8%AF%AD/" data-dictCode="french-english" title="法语-英语词典">法语-英语</a>
</span>
</li>
<li>
- <span class="pointer js-toggle-children" data-target-selector="next" title="Change language direction"><i class="fcdo fcdo-exchange fcdo--nudge" aria-hidden="true"></i></span>
+ <span class="pointer js-toggle-children" data-target-selector="next" title="更改语言方向"><i class="fcdo fcdo-exchange fcdo--nudge" aria-hidden="true"></i></span>
<span>
- <a style="display: inline;" href="https://dictionary.cambridge.org/dictionary/english-german/" data-dictCode="english-german" title="English-German Dictionary">English–German</a>
- <a style="display: none;" href="https://dictionary.cambridge.org/dictionary/german-english/" data-dictCode="german-english" title="German-English Dictionary">German–English</a>
+ <a style="display: inline;" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E5%BE%B7%E8%AF%AD/" data-dictCode="english-german" title="英语-德语词典">英语-德语</a>
+ <a style="display: none;" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E5%BE%B7%E8%AF%AD-%E8%8B%B1%E8%AF%AD/" data-dictCode="german-english" title="德语-英语词典">德语-英语</a>
</span>
</li>
<li>
- <span class="pointer js-toggle-children" data-target-selector="next" title="Change language direction"><i class="fcdo fcdo-exchange fcdo--nudge" aria-hidden="true"></i></span>
+ <span class="pointer js-toggle-children" data-target-selector="next" title="更改语言方向"><i class="fcdo fcdo-exchange fcdo--nudge" aria-hidden="true"></i></span>
<span>
- <a style="display: inline;" href="https://dictionary.cambridge.org/dictionary/english-indonesian/" data-dictCode="english-indonesian" title="English-Indonesian Dictionary">English–Indonesian</a>
- <a style="display: none;" href="https://dictionary.cambridge.org/dictionary/indonesian-english/" data-dictCode="indonesian-english" title="Indonesian-English Dictionary">Indonesian–English</a>
+ <a style="display: inline;" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E5%8D%B0%E5%BA%A6%E5%B0%BC%E8%A5%BF%E4%BA%9A%E8%AF%AD/" data-dictCode="english-indonesian" title="英语-印尼语词典">英语-印尼语</a>
+ <a style="display: none;" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E5%8D%B0%E5%BA%A6%E5%B0%BC%E8%A5%BF%E4%BA%9A%E8%AF%AD-%E8%8B%B1%E8%AF%AD/" data-dictCode="indonesian-english" title="印尼语-英语词典">印尼语-英语</a>
</span>
</li>
<li>
- <span class="pointer js-toggle-children" data-target-selector="next" title="Change language direction"><i class="fcdo fcdo-exchange fcdo--nudge" aria-hidden="true"></i></span>
+ <span class="pointer js-toggle-children" data-target-selector="next" title="更改语言方向"><i class="fcdo fcdo-exchange fcdo--nudge" aria-hidden="true"></i></span>
<span>
- <a style="display: inline;" href="https://dictionary.cambridge.org/dictionary/english-italian/" data-dictCode="english-italian" title="Cambridge English-Italian Dictionary">English–Italian</a>
- <a style="display: none;" href="https://dictionary.cambridge.org/dictionary/italian-english/" data-dictCode="italian-english" title="Italian-English Dictionary">Italian–English</a>
+ <a style="display: inline;" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%84%8F%E5%A4%A7%E5%88%A9%E8%AF%AD/" data-dictCode="english-italian" title="剑桥英语-意大利语词典">英语-意大利语</a>
+ <a style="display: none;" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E6%84%8F%E5%A4%A7%E5%88%A9%E8%AF%AD-%E8%8B%B1%E8%AF%AD/" data-dictCode="italian-english" title="意大利语-英语词典">意大利语–英语</a>
</span>
</li>
<li>
- <span class="pointer js-toggle-children" data-target-selector="next" title="Change language direction"><i class="fcdo fcdo-exchange fcdo--nudge" aria-hidden="true"></i></span>
+ <span class="pointer js-toggle-children" data-target-selector="next" title="更改语言方向"><i class="fcdo fcdo-exchange fcdo--nudge" aria-hidden="true"></i></span>
<span>
- <a style="display: inline;" href="https://dictionary.cambridge.org/dictionary/english-polish/" data-dictCode="english-polish" title="Cambridge English-Polish Dictionary">English–Polish</a>
- <a style="display: none;" href="https://dictionary.cambridge.org/dictionary/polish-english/" data-dictCode="polish-english" title="Polish-English Dictionary">Polish–English</a>
+ <a style="display: inline;" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B3%A2%E5%85%B0%E8%AF%AD/" data-dictCode="english-polish" title="剑桥英语-波兰语词典">英语-波兰语</a>
+ <a style="display: none;" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E6%B3%A2%E5%85%B0%E8%AF%AD-%E8%8B%B1%E8%AF%AD/" data-dictCode="polish-english" title="波兰语-英语词典">波兰语–英语</a>
</span>
</li>
<li>
- <span class="pointer js-toggle-children" data-target-selector="next" title="Change language direction"><i class="fcdo fcdo-exchange fcdo--nudge" aria-hidden="true"></i></span>
+ <span class="pointer js-toggle-children" data-target-selector="next" title="更改语言方向"><i class="fcdo fcdo-exchange fcdo--nudge" aria-hidden="true"></i></span>
<span>
- <a style="display: inline;" href="https://dictionary.cambridge.org/dictionary/english-portuguese/" data-dictCode="english-portuguese" title="Cambridge English-Portuguese Dictionary">English–Portuguese</a>
- <a style="display: none;" href="https://dictionary.cambridge.org/dictionary/portuguese-english/" data-dictCode="portuguese-english" title="Portuguese-English Dictionary">Portuguese–English</a>
+ <a style="display: inline;" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E8%91%A1%E8%90%84%E7%89%99%E8%AF%AD/" data-dictCode="english-portuguese" title="剑桥英语-葡萄牙语词典">英语-葡萄牙语</a>
+ <a style="display: none;" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%91%A1%E8%90%84%E7%89%99%E8%AF%AD-%E8%8B%B1%E8%AF%AD/" data-dictCode="portuguese-english" title="葡萄牙语-英语词典">葡萄牙语–英语</a>
</span>
</li>
<li>
- <span class="pointer js-toggle-children" data-target-selector="next" title="Change language direction"><i class="fcdo fcdo-exchange fcdo--nudge" aria-hidden="true"></i></span>
+ <span class="pointer js-toggle-children" data-target-selector="next" title="更改语言方向"><i class="fcdo fcdo-exchange fcdo--nudge" aria-hidden="true"></i></span>
<span>
- <a style="display: inline;" href="https://dictionary.cambridge.org/dictionary/english-japanese/" data-dictCode="english-japanese" title="Cambridge English-Japanese Dictionary">English–Japanese</a>
- <a style="display: none;" href="https://dictionary.cambridge.org/dictionary/japanese-english/" data-dictCode="japanese-english" title="Japanese-English Dictionary">Japanese–English</a>
+ <a style="display: inline;" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%97%A5%E8%AF%AD/" data-dictCode="english-japanese" title="剑桥英语-日语词典">英语-日语</a>
+ <a style="display: none;" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/japanese-english/" data-dictCode="japanese-english" title="日语-英语词典">日语–英语</a>
</span>
</li>
- <li class="off-canvas__nav__section"><strong>Semi-bilingual</strong></li>
- <li><a href="https://dictionary.cambridge.org/dictionary/english-arabic/" title="Cambridge English-Arabic Dictionary">English–Arabic</a></li>
- <li><a href="https://dictionary.cambridge.org/dictionary/english-catalan/" title="Cambridge English-Catalan Dictionary">English–Catalan</a></li>
- <li><a href="https://dictionary.cambridge.org/dictionary/english-chinese-simplified/" title="Cambridge English-Chinese (Simplified) Dictionary">English–Chinese (Simplified)</a></li>
- <li><a href="https://dictionary.cambridge.org/dictionary/english-chinese-traditional/" title="Cambridge English-Chinese (Traditional) Dictionary">English–Chinese (Traditional)</a></li>
- <li><a href="https://dictionary.cambridge.org/dictionary/english-korean/" title="Cambridge English-Korean Dictionary">English–Korean</a></li>
- <li><a href="https://dictionary.cambridge.org/dictionary/english-malaysian/" title="English-Malay Dictionary">English–Malay</a></li>
- <li><a href="https://dictionary.cambridge.org/dictionary/english-russian/" title="Cambridge English-Russian Dictionary">English–Russian</a></li>
- <li><a href="https://dictionary.cambridge.org/dictionary/english-thai/" title="English-Thai Dictionary">English–Thai</a></li>
- <li><a href="https://dictionary.cambridge.org/dictionary/turkish/" title="English-Turkish Dictionary, İngilizce-Türkçe Çeviri">English–Turkish</a></li>
- <li><a href="https://dictionary.cambridge.org/dictionary/english-vietnamese/" title="English-Vietnamese Dictionary">English–Vietnamese</a></li>
+ <li class="off-canvas__nav__section"><strong>半双语</strong></li>
+ <li><a href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8D%B7%E5%85%B0%E8%AF%AD-%E8%8B%B1%E8%AF%AD/" title="荷兰语-英语词典">荷兰语-英语</a></li>
+ <li><a href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E9%98%BF%E6%8B%89%E4%BC%AF%E8%AF%AD/" title="剑桥英语-阿拉伯语词典">英语-阿拉伯语</a></li>
+ <li><a href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E5%8A%A0%E6%B3%B0%E7%BD%97%E5%B0%BC%E4%BA%9A%E8%AF%AD/" title="剑桥英语-加泰罗尼亚语词典">英语-加泰罗尼亚语</a></li>
+ <li><a href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%AE%80%E4%BD%93/" title="剑桥英语-汉语（简体）词典">英语-汉语（简体）</a></li>
+ <li><a href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%B9%81%E4%BD%93/" title="剑桥英语-汉语（繁体）词典">英语-汉语（繁体）</a></li>
+ <li><a href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%8D%B7%E5%85%8B%E8%AF%AD/" title="英语-捷克语词典">英语- 捷克语</a></li>
+ <li><a href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E4%B8%B9%E9%BA%A6%E8%AF%AD/" title="英语-丹麦语词典">英语- 丹麦语</a></li>
+ <li><a href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E9%9F%A9%E8%AF%AD/" title="剑桥英语-韩语词典">英语-韩语</a></li>
+ <li><a href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E9%A9%AC%E6%9D%A5%E8%A5%BF%E4%BA%9A%E8%AF%AD/" title="英语-马来语词典">英语-马来语</a></li>
+ <li><a href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%8C%AA%E5%A8%81%E8%AF%AD/" title="英语-挪威语词典">英语-挪威语</a></li>
+ <li><a href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E4%BF%84%E8%AF%AD/" title="剑桥英语-俄语词典">英语-俄语</a></li>
+ <li><a href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B3%B0%E8%AF%AD/" title="英语-泰语词典">英语-泰语</a></li>
+ <li><a href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E5%9C%9F%E8%80%B3%E5%85%B6%E8%AF%AD/" title="英语-土耳其语词典">英语-土耳其语</a></li>
+ <li><a href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E8%B6%8A%E5%8D%97%E8%AF%AD/" title="英语-越南语词典">英语-越南语</a></li>
</ul>
</li>
</ul>
</li>
<li >
- <a href="https://dictionary.cambridge.org/translate/">Translate</a>
+ <a href="https://dictionary.cambridge.org/zhs/translate/">翻译</a>
</li>
<li >
- <a href="https://dictionary.cambridge.org/grammar/british-grammar/">Grammar</a>
+ <a href="https://dictionary.cambridge.org/zhs/%E8%AF%AD%E6%B3%95/%E8%8B%B1%E5%BC%8F%E8%AF%AD%E6%B3%95/">语法</a>
</li>
</ul>
</nav>
<div class="off-canvas__pad">
<p>
- <a class="btn btn--impact btn--bold js-toggle" data-target-selector="#modal-login">
- <i class="fcdo fcdo-user" aria-hidden="true"></i> Log in </a>
+ <a class="btn btn--impact btn--bold loginBtn btn--forbidden">
+ <i class="fcdo fcdo-user" aria-hidden="true"></i> 登录 </a>
</p>
<div class="off-canvas__dropdown">
<a href="" class="ico-bg ico-bg--chevron js-accord" data-target-selector="#cdo-lang-opt-sideBarMenu">
- <i class="fcdo fcdo-globe" aria-hidden="true"></i> <span class="resp resp--lrg-i">English (UK)</span>
+ <i class="fcdo fcdo-globe" aria-hidden="true"></i> <span class="resp resp--lrg-i">中文 (简体)</span>
</a>
<div style="display: none;" id="cdo-lang-opt-sideBarMenu">
@@ -446,6 +595,7 @@
<li><a href="/dictionary/english/love" hreflang="en">English (UK)</a>
<li><a href="/us/dictionary/english/love" hreflang="en-US">English (US)</a>
<li><a href="/es/diccionario/ingles/love" hreflang="es">Español</a>
+ <li><a href="/es-LA/dictionary/english/love" hreflang="es-419">Español (Latinoamérica)</a>
<li><a href="/ru/%D1%81%D0%BB%D0%BE%D0%B2%D0%B0%D1%80%D1%8C/%D0%B0%D0%BD%D0%B3%D0%BB%D0%B8%D0%B9%D1%81%D0%BA%D0%B8%D0%B9/love" hreflang="ru">Русский</a>
<li><a href="/pt/dicionario/ingles/love" hreflang="pt">Português</a>
<li><a href="/de/worterbuch/englisch/love" hreflang="de">Deutsch</a>
@@ -453,6 +603,7 @@
<li><a href="/it/dizionario/inglese/love" hreflang="it">Italiano</a>
<li><a href="/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD/love" hreflang="zh-Hans">中文 (简体)</a>
<li><a href="/zht/%E8%A9%9E%E5%85%B8/%E8%8B%B1%E8%AA%9E/love" hreflang="zh-Hant">正體中文 (繁體)</a>
+ <li><a href="/pl/dictionary/english/love" hreflang="pl">Polski</a>
<li><a href="/ko/%EC%82%AC%EC%A0%84/%EC%98%81%EC%96%B4/love" hreflang="ko">한국어</a>
<li><a href="/tr/s%C3%B6zl%C3%BCk/ingilizce/love" hreflang="tr">Türkçe</a>
<li><a href="/ja/dictionary/english/love" hreflang="ja">日本語</a>
@@ -472,24 +623,24 @@
<div class="cdo-hdr__soc resp resp--lrg">
<ul class="unstyled">
- <li><b>Follow us</b></li>
- <li><a href="https://www.facebook.com/home.php?#!/pages/Cambridge-Dictionaries-Online/118775618133878" title="Likes" class="circle bg--fb" target="_blank"><i class="fcdo fcdo-facebook" aria-hidden="true"></i></a></li>
- <li><a href="https://twitter.com/CambridgeWords" title="Followers" class="circle bg--tw" target="_blank"><i class="fcdo fcdo-twitter" aria-hidden="true"></i></a></li>
- <li><a href="https://plus.google.com/b/108790671280639180398" title="Fans" class="circle bg--gp" target="_blank"><i class="fcdo fcdo-google-plus" aria-hidden="true"></i></a></li>
+ <li><b>关注我们</b></li>
+ <li><a href="https://www.facebook.com/home.php?#!/pages/Cambridge-Dictionaries-Online/118775618133878" title="赞" class="circle bg--fb" target="_blank"><i class="fcdo fcdo-facebook" aria-hidden="true"></i></a></li>
+ <li><a href="https://twitter.com/CambridgeWords" title="关注" class="circle bg--tw" target="_blank"><i class="fcdo fcdo-twitter" aria-hidden="true"></i></a></li>
+ <li><a href="https://plus.google.com/+cambridgedictionary" title="粉丝" class="circle bg--gp" target="_blank"><i class="fcdo fcdo-google-plus" aria-hidden="true"></i></a></li>
</ul>
</div>
<div class="cdo-hdr__profile">
<a class="hdr-btn ico-bg js-toggle" >
- <span class="btn btn--impact btn--bold js-toggle" data-target-selector="#modal-login">
- <i class="fcdo fcdo-user"></i>
- <span class="resp resp--lrg-i">Log in</span>
- </span>
+ <span class="btn btn--impact btn--bold loginBtn btn--forbidden">
+ <i class="fcdo fcdo-user"></i>
+ <span class="resp resp--lrg-i">登录</span>
+ </span>
</a>
<div class="dropdown dropdown--pad-a dropdown--right">
<a href="" class="hdr-btn ico-bg ico-bg--chevron js-toggle"
data-target-selector="#cdo-lang-opt"><i class="fcdo fcdo-globe" aria-hidden="true"></i> <span
- class="resp resp--lrg-i">English (UK)</span></a>
+ class="resp resp--lrg-i">中文 (简体)</span></a>
<!-- link to language page as fallback? -->
<div id="cdo-lang-opt" class="dropdown__box rounded">
@@ -497,6 +648,7 @@
<li><a href="/dictionary/english/love" hreflang="en">English (UK)</a></li>
<li><a href="/us/dictionary/english/love" hreflang="en-US">English (US)</a></li>
<li><a href="/es/diccionario/ingles/love" hreflang="es">Español</a></li>
+ <li><a href="/es-LA/dictionary/english/love" hreflang="es-419">Español (Latinoamérica)</a></li>
<li><a href="/ru/%D1%81%D0%BB%D0%BE%D0%B2%D0%B0%D1%80%D1%8C/%D0%B0%D0%BD%D0%B3%D0%BB%D0%B8%D0%B9%D1%81%D0%BA%D0%B8%D0%B9/love" hreflang="ru">Русский</a></li>
<li><a href="/pt/dicionario/ingles/love" hreflang="pt">Português</a></li>
<li><a href="/de/worterbuch/englisch/love" hreflang="de">Deutsch</a></li>
@@ -504,6 +656,7 @@
<li><a href="/it/dizionario/inglese/love" hreflang="it">Italiano</a></li>
<li><a href="/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD/love" hreflang="zh-Hans">中文 (简体)</a></li>
<li><a href="/zht/%E8%A9%9E%E5%85%B8/%E8%8B%B1%E8%AA%9E/love" hreflang="zh-Hant">正體中文 (繁體)</a></li>
+ <li><a href="/pl/dictionary/english/love" hreflang="pl">Polski</a></li>
<li><a href="/ko/%EC%82%AC%EC%A0%84/%EC%98%81%EC%96%B4/love" hreflang="ko">한국어</a></li>
<li><a href="/tr/s%C3%B6zl%C3%BCk/ingilizce/love" hreflang="tr">Türkçe</a></li>
<li><a href="/ja/dictionary/english/love" hreflang="ja">日本語</a></li>
@@ -512,20 +665,20 @@
</div>
</div> </div>
- <a href="#" class="burger js-nav-trig" aria-hidden="true"><span><b class="accessibility">Menu</b></span></a>
+ <a href="#" class="burger js-nav-trig" aria-hidden="true"><span><b class="accessibility">菜单</b></span></a>
- <a href="https://dictionary.cambridge.org/" class="cdo-logo cdo-logo--sml hide-txt" title="Cambridge Dictionary">Cambridge Dictionary</a>
+ <a href="https://dictionary.cambridge.org/zhs/" class="cdo-logo cdo-logo--sml hide-txt" title="Cambridge Dictionary">Cambridge Dictionary</a>
<nav id="main-nav" class="cdo-hdr__nav resp resp--med">
<ul>
<li class="active">
- <a href="https://dictionary.cambridge.org/dictionary/">Dictionary</a>
+ <a href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/">词典</a>
</li>
<li >
- <a href="https://dictionary.cambridge.org/translate/">Translate</a>
+ <a href="https://dictionary.cambridge.org/zhs/translate/">翻译</a>
</li>
<li >
- <a href="https://dictionary.cambridge.org/grammar/british-grammar/">Grammar</a>
+ <a href="https://dictionary.cambridge.org/zhs/%E8%AF%AD%E6%B3%95/%E8%8B%B1%E5%BC%8F%E8%AF%AD%E6%B3%95/">语法</a>
</li>
</ul>
</nav>
@@ -533,15 +686,15 @@
</div>
<div class="cdo-search">
- <a href="https://dictionary.cambridge.org/" class="cdo-logo hide-txt resp resp--lrg" title="Back to home page">Back to home page</a>
- <form id="cdo-search-form" action="/search/english/direct/">
+ <a href="https://dictionary.cambridge.org/zhs/" class="cdo-logo hide-txt resp resp--lrg" title="回到首页">回到首页</a>
+ <form id="cdo-search-form" action="/zhs/%E6%90%9C%E7%B4%A2/%E8%8B%B1%E8%AF%AD/direct/">
<div class="cdo-search__bar">
- <label class="accessibility" for="cdo-search-input">Search Term</label>
- <input type="text" name="q" class="cdo-search__input" id="cdo-search-input" autocomplete="off" aria-required="true" aria-invalid="false" placeholder="Search " />
+ <label class="accessibility" for="cdo-search-input">搜索词</label>
+ <input type="text" name="q" class="cdo-search__input" id="cdo-search-input" autocomplete="off" aria-required="true" aria-invalid="false" placeholder="搜索 " />
<span class="cdo-search__controls">
- <button type="submit" class="cdo-search__button" title="Search"><i class="fcdo fcdo-search" aria-hidden="true"></i><span class="accessibility">Search</span></button>
+ <button type="submit" class="cdo-search__button" title="搜索"><i class="fcdo fcdo-search" aria-hidden="true"></i><span class="accessibility">搜索</span></button>
<button class="cdo-search__dataset js-toggle ico-bg-abs ico-bg--chevron" data-target-selector="#cdo-dataset">
<span id="cdo-search-current-dataset" class="resp resp--med-i"></span>
<i class="fcdo fcdo-dataset" aria-hidden="true"></i>
@@ -552,101 +705,105 @@
<div class="pad-extra">
<div class="cdo-search__mega-menu__canvas a--rev">
<div class="cdo-search__mega-menu__col1">
- <div class="h2 js-toggle" data-is-basic="1" data-target-selector="#megaMenuRecent">Recent and Recommended</div>
+ <div class="h2 js-toggle" data-is-basic="1" data-target-selector="#megaMenuRecent">最近的词和建议</div>
<div id="megaMenuRecent" class="cdo-search__mega-menu__links">
<ul id="cdo-dataset-prefered-list"></ul>
</div>
- <div class="h2 js-toggle" data-is-basic="1" data-target-selector="#megaMenuDefinition">Definitions and Grammar</div>
+ <div class="h2 js-toggle" data-is-basic="1" data-target-selector="#megaMenuDefinition">定义和语法</div>
<div id="megaMenuDefinition" class="cdo-search__mega-menu__links">
- <p>Clear explanations of natural written and spoken English</p>
+ <p>清晰的书面英语和英语口语解释</p>
<ul>
- <li><a href="#" data-dictCode="english" title="Cambridge English Dictionary">English</a></li>
- <li><a href="#" data-dictCode="learner-english" title="Learner’s Dictionary">Learner’s Dictionary</a></li>
- <li><a href="#" data-dictCode="essential-british-english" title="Essential British English Dictionary">Essential British English</a></li>
- <li><a href="#" data-dictCode="essential-american-english" title="Essential American English Dictionary">Essential American English</a></li>
- <li><a href="#" data-dictCode="british-grammar" title="Grammar">Grammar</a></li>
+ <li><a href="#" data-dictCode="english" title="剑桥英语词典">英语</a></li>
+ <li><a href="#" data-dictCode="learner-english" title="学习词典">学习词典</a></li>
+ <li><a href="#" data-dictCode="essential-british-english" title="基础英式英语词典">基础英式英语</a></li>
+ <li><a href="#" data-dictCode="essential-american-english" title="基础美式英语词典">基础美式英语</a></li>
+ <li><a href="#" data-dictCode="british-grammar" title="英语语法">英语语法</a></li>
</ul>
</div>
</div>
<div class="cdo-search__mega-menu__col2">
- <div class="h2 js-toggle" data-is-basic="1" data-target-selector="#megaMenuTranslation">Translation</div>
+ <div class="h2 js-toggle" data-is-basic="1" data-target-selector="#megaMenuTranslation">翻译</div>
<div id="megaMenuTranslation" class="cdo-search__mega-menu__links">
- <div class="h3">Bilingual Dictionaries</div>
- <p>Click on the arrows to change the translation direction.</p>
+ <div class="h3">双语词典</div>
+ <p>点击箭头改变翻译方向。</p>
<ul>
<li>
- <span class="bilingual-switch pointer js-toggle-children" data-target-selector="next" title="Change language direction"><i class="fcdo fcdo-exchange fcdo--nudge" aria-hidden="true"></i></span>
+ <span class="bilingual-switch pointer js-toggle-children" data-target-selector="next" title="更改语言方向"><i class="fcdo fcdo-exchange fcdo--nudge" aria-hidden="true"></i></span>
<span>
- <a style="display: inline;" href="#" data-dictCode="english-spanish" title="English-Spanish Dictionary">English–Spanish</a>
- <a style="display: none;" href="#" data-dictCode="spanish-english" title="Diccionario Español-inglés">Spanish–English</a>
+ <a style="display: inline;" href="#" data-dictCode="english-spanish" title="英语-西班牙语词典">英语-西班牙语</a>
+ <a style="display: none;" href="#" data-dictCode="spanish-english" title="西班牙语-英语词典">西班牙语-英语</a>
</span>
</li>
<li>
- <span class="bilingual-switch pointer js-toggle-children" data-target-selector="next" title="Change language direction"><i class="fcdo fcdo-exchange fcdo--nudge" aria-hidden="true"></i></span>
+ <span class="bilingual-switch pointer js-toggle-children" data-target-selector="next" title="更改语言方向"><i class="fcdo fcdo-exchange fcdo--nudge" aria-hidden="true"></i></span>
<span>
- <a style="display: inline;" href="#" data-dictCode="english-french" title="English-French Dictionary">English–French</a>
- <a style="display: none;" href="#" data-dictCode="french-english" title="French-English Dictionary">French–English</a>
+ <a style="display: inline;" href="#" data-dictCode="english-french" title="英语-法语词典">英语-法语</a>
+ <a style="display: none;" href="#" data-dictCode="french-english" title="法语-英语词典">法语-英语</a>
</span>
</li>
<li>
- <span class="bilingual-switch pointer js-toggle-children" data-target-selector="next" title="Change language direction"><i class="fcdo fcdo-exchange fcdo--nudge" aria-hidden="true"></i></span>
+ <span class="bilingual-switch pointer js-toggle-children" data-target-selector="next" title="更改语言方向"><i class="fcdo fcdo-exchange fcdo--nudge" aria-hidden="true"></i></span>
<span>
- <a style="display: inline;" href="#" data-dictCode="english-german" title="English-German Dictionary">English–German</a>
- <a style="display: none;" href="#" data-dictCode="german-english" title="German-English Dictionary">German–English</a>
+ <a style="display: inline;" href="#" data-dictCode="english-german" title="英语-德语词典">英语-德语</a>
+ <a style="display: none;" href="#" data-dictCode="german-english" title="德语-英语词典">德语-英语</a>
</span>
</li>
<li>
- <span class="bilingual-switch pointer js-toggle-children" data-target-selector="next" title="Change language direction"><i class="fcdo fcdo-exchange fcdo--nudge" aria-hidden="true"></i></span>
+ <span class="bilingual-switch pointer js-toggle-children" data-target-selector="next" title="更改语言方向"><i class="fcdo fcdo-exchange fcdo--nudge" aria-hidden="true"></i></span>
<span>
- <a style="display: inline;" href="#" data-dictCode="english-indonesian" title="English-Indonesian Dictionary">English–Indonesian</a>
- <a style="display: none;" href="#" data-dictCode="indonesian-english" title="Indonesian-English Dictionary">Indonesian–English</a>
+ <a style="display: inline;" href="#" data-dictCode="english-indonesian" title="英语-印尼语词典">英语-印尼语</a>
+ <a style="display: none;" href="#" data-dictCode="indonesian-english" title="印尼语-英语词典">印尼语-英语</a>
</span>
</li>
<li>
- <span class="bilingual-switch pointer js-toggle-children" data-target-selector="next" title="Change language direction"><i class="fcdo fcdo-exchange fcdo--nudge" aria-hidden="true"></i></span>
+ <span class="bilingual-switch pointer js-toggle-children" data-target-selector="next" title="更改语言方向"><i class="fcdo fcdo-exchange fcdo--nudge" aria-hidden="true"></i></span>
<span>
- <a style="display: inline;" href="#" data-dictCode="english-italian" title="Cambridge English-Italian Dictionary">English–Italian</a>
- <a style="display: none;" href="#" data-dictCode="italian-english" title="Italian-English Dictionary">Italian–English</a>
+ <a style="display: inline;" href="#" data-dictCode="english-italian" title="剑桥英语-意大利语词典">英语-意大利语</a>
+ <a style="display: none;" href="#" data-dictCode="italian-english" title="意大利语-英语词典">意大利语–英语</a>
</span>
</li>
<li>
- <span class="bilingual-switch pointer js-toggle-children" data-target-selector="next" title="Change language direction"><i class="fcdo fcdo-exchange fcdo--nudge" aria-hidden="true"></i></span>
+ <span class="bilingual-switch pointer js-toggle-children" data-target-selector="next" title="更改语言方向"><i class="fcdo fcdo-exchange fcdo--nudge" aria-hidden="true"></i></span>
<span>
- <a style="display: inline;" href="#" data-dictCode="english-polish" title="Cambridge English-Polish Dictionary">English–Polish</a>
- <a style="display: none;" href="#" data-dictCode="polish-english" title="Polish-English Dictionary">Polish–English</a>
+ <a style="display: inline;" href="#" data-dictCode="english-polish" title="剑桥英语-波兰语词典">英语-波兰语</a>
+ <a style="display: none;" href="#" data-dictCode="polish-english" title="波兰语-英语词典">波兰语–英语</a>
</span>
</li>
<li>
- <span class="bilingual-switch pointer js-toggle-children" data-target-selector="next" title="Change language direction"><i class="fcdo fcdo-exchange fcdo--nudge" aria-hidden="true"></i></span>
+ <span class="bilingual-switch pointer js-toggle-children" data-target-selector="next" title="更改语言方向"><i class="fcdo fcdo-exchange fcdo--nudge" aria-hidden="true"></i></span>
<span>
- <a style="display: inline;" href="#" data-dictCode="english-portuguese" title="Cambridge English-Portuguese Dictionary">English–Portuguese</a>
- <a style="display: none;" href="#" data-dictCode="portuguese-english" title="Portuguese-English Dictionary">Portuguese–English</a>
+ <a style="display: inline;" href="#" data-dictCode="english-portuguese" title="剑桥英语-葡萄牙语词典">英语-葡萄牙语</a>
+ <a style="display: none;" href="#" data-dictCode="portuguese-english" title="葡萄牙语-英语词典">葡萄牙语–英语</a>
</span>
</li>
<li>
- <span class="bilingual-switch pointer js-toggle-children" data-target-selector="next" title="Change language direction"><i class="fcdo fcdo-exchange fcdo--nudge" aria-hidden="true"></i></span>
+ <span class="bilingual-switch pointer js-toggle-children" data-target-selector="next" title="更改语言方向"><i class="fcdo fcdo-exchange fcdo--nudge" aria-hidden="true"></i></span>
<span>
- <a style="display: inline;" href="#" data-dictCode="english-japanese" title="Cambridge English-Japanese Dictionary">English–Japanese</a>
- <a style="display: none;" href="#" data-dictCode="japanese-english" title="Japanese-English Dictionary">Japanese–English</a>
+ <a style="display: inline;" href="#" data-dictCode="english-japanese" title="剑桥英语-日语词典">英语-日语</a>
+ <a style="display: none;" href="#" data-dictCode="japanese-english" title="日语-英语词典">日语–英语</a>
</span>
</li>
</ul>
- <div class="h3">Semi-bilingual Dictionaries</div>
+ <div class="h3">半双语词典</div>
<ul>
- <li><a href="#" data-dictCode="english-arabic" title="Cambridge English-Arabic Dictionary">English–Arabic</a></li>
- <li><a href="#" data-dictCode="english-catalan" title="Cambridge English-Catalan Dictionary">English–Catalan</a></li>
- <li><a href="#" data-dictCode="english-chinese-simplified" title="Cambridge English-Chinese (Simplified) Dictionary">English–Chinese (Simplified)</a></li>
- <li><a href="#" data-dictCode="english-chinese-traditional" title="Cambridge English-Chinese (Traditional) Dictionary">English–Chinese (Traditional)</a></li>
- <li><a href="#" data-dictCode="english-korean" title="Cambridge English-Korean Dictionary">English–Korean</a></li>
- <li><a href="#" data-dictCode="english-malaysian" title="English-Malay Dictionary">English–Malay</a></li>
- <li><a href="#" data-dictCode="english-russian" title="Cambridge English-Russian Dictionary">English–Russian</a></li>
- <li><a href="#" data-dictCode="english-thai" title="English-Thai Dictionary">English–Thai</a></li>
- <li><a href="#" data-dictCode="turkish" title="English-Turkish Dictionary, İngilizce-Türkçe Çeviri">English–Turkish</a></li>
- <li><a href="#" data-dictCode="english-vietnamese" title="English-Vietnamese Dictionary">English–Vietnamese</a></li>
+ <li><a href="#" data-dictCode="dutch-english" title="荷兰语-英语词典">荷兰语-英语</a></li>
+ <li><a href="#" data-dictCode="english-arabic" title="剑桥英语-阿拉伯语词典">英语-阿拉伯语</a></li>
+ <li><a href="#" data-dictCode="english-catalan" title="剑桥英语-加泰罗尼亚语词典">英语-加泰罗尼亚语</a></li>
+ <li><a href="#" data-dictCode="english-chinese-simplified" title="剑桥英语-汉语（简体）词典">英语-汉语（简体）</a></li>
+ <li><a href="#" data-dictCode="english-chinese-traditional" title="剑桥英语-汉语（繁体）词典">英语-汉语（繁体）</a></li>
+ <li><a href="#" data-dictCode="english-czech" title="英语-捷克语词典">英语- 捷克语</a></li>
+ <li><a href="#" data-dictCode="english-danish" title="英语-丹麦语词典">英语- 丹麦语</a></li>
+ <li><a href="#" data-dictCode="english-korean" title="剑桥英语-韩语词典">英语-韩语</a></li>
+ <li><a href="#" data-dictCode="english-malaysian" title="英语-马来语词典">英语-马来语</a></li>
+ <li><a href="#" data-dictCode="english-norwegian" title="英语-挪威语词典">英语-挪威语</a></li>
+ <li><a href="#" data-dictCode="english-russian" title="剑桥英语-俄语词典">英语-俄语</a></li>
+ <li><a href="#" data-dictCode="english-thai" title="英语-泰语词典">英语-泰语</a></li>
+ <li><a href="#" data-dictCode="turkish" title="英语-土耳其语词典">英语-土耳其语</a></li>
+ <li><a href="#" data-dictCode="english-vietnamese" title="英语-越南语词典">英语-越南语</a></li>
</ul>
</div>
</div>
@@ -661,6 +818,8 @@
</form> </div>
</header>
+ <div id="overlay"></div>
+
<div id='ad_topslot_a' class='am-default '>
<script type='text/javascript'>
@@ -757,1497 +916,1399 @@
-<script>
- var forceDictCode = "english";
-</script>
-<div id="page-content" class="cdo-tpl__z cdo-tpl-main__z2 clrd" role="main">
- <div id="entryContent" class="entrybox english" lang="en" itemscope itemtype="http://schema.org/WebPage">
- <div itemprop="author" itemscope itemtype="http://schema.org/Organization">
- <meta itemprop="name" content='Cambridge Dictionary' />
- <meta itemprop="url" content="https://plus.google.com/108790671280639180398" />
- </div>
- <div itemprop="publisher" itemscope itemtype="http://schema.org/Organization">
- <meta itemprop="name" content="© Cambridge University Press " />
- <meta itemprop="url" content="https://plus.google.com/112563436639321822653" />
- </div>
- <meta itemprop="headline" content="love definition: 1. to like another adult very much and be romantically and sexually attracted to them, or to have strong feelings of liking a friend or person in your family: 2. to like something very much: 3. used, often in requests, to say that you would very much like something: . Learn more." />
- <meta itemprop="copyrightHolder" content="© Cambridge University Press" />
- <meta itemprop="copyrightYear" content="2018" />
- <meta itemprop="inLanguage" content="en" />
- <meta itemprop="genre" content="Liking" />
- <meta itemprop="genre" content="Tennis & racket sports" />
- <meta itemprop="genre" content="Loving and in love" />
- <meta itemprop="genre" content="Wanting things" />
- <meta itemprop="genre" content="Written greetings" />
- <meta itemprop="genre" content="Unachievable" />
- <meta itemprop="genre" content="Not liking" />
- <h1 class="hw">Meaning of “love” in the English Dictionary</h1>
- <div id="dataset-british" data-tab="ds-british" role="tabpanel" data-wordlist-dataset="british">
- <div class="resp-hide--med">
- <div class="nav-entry-mob clrd">
- <div class="nav-entry-mob__datasets dropdown dropdown--pad-a dropdown--white">
- <span class="btn btn--dropdown js-toggle" data-target-selector="#cdo-mob-datasetsbritish"><span id="mobEntryDictName">English</span></span>
- <div id="cdo-mob-datasetsbritish" class="dropdown__box rounded">
- <ul class="unstyled">
- <li><a href="#dataset-british" class="js-trigger on " data-tab="ds-british" data-target-trigger="#aTabEntrybritish" data-target-updtext="#mobEntryDictName">English</a></li>
- <li><a href="#dataset-american-english" class="js-trigger " data-tab="ds-american-english" data-target-trigger="#aTabEntryamerican-english" data-target-updtext="#mobEntryDictName">American</a></li>
- <li><a href="#dataset-example" class="js-trigger " data-tab="ds-example" data-target-trigger="#aTabEntryexample" data-target-updtext="#mobEntryDictName">Examples</a></li>
- </ul>
- </div>
- </div>
- <a href="#" class="nav-entry-mob__content-toggle txt-block txt-block--alt3 js-toggle" title="View table of contents" data-target-selector="#cdo-mob-tocbritish"><i class="fcdo fcdo-navicon"></i> Contents</a>
- <div id="cdo-mob-tocbritish" class="clr nav-entry-mob__content hide">
- <aside role="complementary">
- <div data-toc="ds-british" class="mod mod--style4 mod--flush mod-toc resp resp--med" style="display:block" >
- <div class="h3 txt-block txt-block--alt3 flush resp-show--med">Contents</div>
- <ul class="unstyled unstyled-nest accord js-accord-ul">
+
+
+
+
+
+
+
+
+
+<script>
+ var forceDictCode = "english";
+</script>
+
+<div id="page-content" class="cdo-tpl__z cdo-tpl-main__z2 clrd" role="main">
+ <div id="entryContent" class="entrybox english entry-body" lang="en" itemscope itemtype="http://schema.org/WebPage">
+ <div itemprop="author" itemscope itemtype="http://schema.org/Organization">
+ <meta itemprop="name" content='Cambridge Dictionary' />
+ <meta itemprop="url" content="https://plus.google.com/+cambridgedictionary" />
+ </div>
+ <meta itemprop="headline" content="love的意思、解释及翻译：1. to like another adult very much and be romantically and sexually attracted to them, or to have strong feelings of liking a friend or person in your family: 2. to like something very much: 3. used, often in requests, to say that you would very much like something: 。了解更多。" />
+ <meta itemprop="copyrightHolder" content="© Cambridge University Press" />
+ <meta itemprop="copyrightYear" content="2018" />
+ <meta itemprop="inLanguage" content="en" />
+ <meta itemprop="genre" content="Liking" />
+ <meta itemprop="genre" content="Tennis & racket sports" />
+ <meta itemprop="genre" content="Loving and in love" />
+ <meta itemprop="genre" content="Unachievable" />
+ <meta itemprop="genre" content="Written greetings" />
+ <meta itemprop="genre" content="Wanting things" />
+ <meta itemprop="genre" content="Not liking" />
+
+ <div class="cdo-dblclick-area">
+ <h1 class="hw">“love”在英语词典中的解释及翻译</h1>
+ <div class="page" data-type="sorter"> <div class="dictionary" data-type="sorted" data-id="cald4" id="dataset-cald4" data-tab="ds-cald4" role="tabpanel"> <div class="resp-hide--med">
+ <div class="nav-entry-mob clrd">
+ <div class="nav-entry-mob__datasets dropdown dropdown--pad-a dropdown--white">
+ <span class="btn btn--dropdown js-toggle" data-target-selector="#cdo-mob-datasetscald4"><span id="mobEntryDictName">英语</span></span>
+ <div id="cdo-mob-datasetscald4" class="dropdown__box rounded">
+ <ul class="unstyled">
+ <li><a href="#dataset-cald4" class="js-trigger on " data-tab="ds-cald4" data-target-trigger="#aTabEntrycald4" data-target-updtext="#mobEntryDictName">英语</a></li>
+ <li><a href="#dataset-cacd" class="js-trigger " data-tab="ds-cacd" data-target-trigger="#aTabEntrycacd" data-target-updtext="#mobEntryDictName">美式</a></li>
+ <li><a href="#dataset-examples" class="js-trigger " data-tab="ds-examples" data-target-trigger="#aTabEntryexamples" data-target-updtext="#mobEntryDictName">例句</a></li>
+ </ul>
+ </div>
+ </div>
+ <div> <a href="#" class="nav-entry-mob__content-toggle txt-block txt-block--alt3 js-toggle resp-hide--med" title="View table of contents" data-target-selector="#cdo-mob-toc-cald4"><i class="fcdo fcdo-navicon"> </i> Contents</a> <div id="cdo-mob-toc-cald4" class=" clr nav-entry-mob__content hide resp-hide--med "><aside role="complementary"><div data-toc="ds-english" class="mod mod--style4 mod--flush mod-toc">
+<div class="h3 txt-block txt-block--alt3 flush resp-show--med">内容</div>
+<ul class="unstyled unstyled-nest accord js-accord-ul">
<li class="section">
<a>verb <span class="smaller">(2)</span></a><ul>
-<li><a onclick="ga('send','event', 'navigation', 'navigation-link' );" href="#british-1-1-1" title="love meaning
+<li><a onclick="ga('send','event', 'navigation', 'navigation-link' );" href="#cald4-1-1-1" title="love 意思
"><span class="hw">love</span> <span class="alt gw">(LIKE SOMEONE)</span></a></li>
-<li><a onclick="ga('send','event', 'navigation', 'navigation-link' );" href="#british-1-1-2" title="love meaning
+<li><a onclick="ga('send','event', 'navigation', 'navigation-link' );" href="#cald4-1-1-2" title="love 意思
"><span class="hw">love</span> <span class="alt gw">(LIKE SOMETHING)</span></a></li>
</ul>
</li>
<li class="section">
<a>noun <span class="smaller">(3)</span></a><ul>
-<li><a onclick="ga('send','event', 'navigation', 'navigation-link' );" href="#british-1-2-1" title="love meaning
+<li><a onclick="ga('send','event', 'navigation', 'navigation-link' );" href="#cald4-1-2-1" title="love 意思
"><span class="hw">love</span> <span class="alt gw">(LIKING SOMEONE)</span></a></li>
-<li><a onclick="ga('send','event', 'navigation', 'navigation-link' );" href="#british-1-2-2" title="love meaning
+<li><a onclick="ga('send','event', 'navigation', 'navigation-link' );" href="#cald4-1-2-2" title="love 意思
"><span class="hw">love</span> <span class="alt gw">(LIKING SOMETHING)</span></a></li>
-<li><a onclick="ga('send','event', 'navigation', 'navigation-link' );" href="#british-1-2-3" title="love meaning
+<li><a onclick="ga('send','event', 'navigation', 'navigation-link' );" href="#cald4-1-2-3" title="love 意思
"><span class="hw">love</span> <span class="alt gw">(TENNIS)</span></a></li>
</ul>
</li>
</ul>
- </div>
- <div data-toc="ds-american-english" class="mod mod--style4 mod--flush mod-toc resp resp--med" style="display:none">
- <div class="h3 txt-block txt-block--alt3 flush resp-show--med">Contents</div>
- <ul class="unstyled unstyled-nest accord js-accord-ul">
-<li class="section">
-<a>verb <span class="smaller">(2)</span></a><ul>
-<li><a onclick="ga('send','event', 'navigation', 'navigation-link' );" href="#american-english-1-1-1" title="love meaning
- "><span class="hw">love</span> <span class="alt gw">(LIKE SOMEONE)</span></a></li>
-<li><a onclick="ga('send','event', 'navigation', 'navigation-link' );" href="#american-english-1-1-2" title="love meaning
- "><span class="hw">love</span> <span class="alt gw">(LIKE SOMETHING)</span></a></li>
-</ul>
-</li>
-<li class="section">
-<a>noun <span class="smaller">(1)</span></a><ul><li><a onclick="ga('send','event', 'navigation', 'navigation-link' );" href="#american-english-1-2-1" title="love meaning
- "><span class="hw">love</span> <span class="alt gw">(LIKING SOMEONE)</span></a></li></ul>
-</li>
-</ul>
- </div>
- </aside> </div>
- </div>
- </div>
- <div class="entry-nav tabs__tabs js-tabs resp resp--med">
- <!-- NOTE: Tabs count added as a data attribute, can be added via js if required and used to size correctly -->
- <ul data-tabs-count=4 role="tablist">
- <li role="presentation">
- <a href="#dataset-british" id="aTabEntrybritish" class="js-trigger on " data-tab="ds-british" role="tab" aria-selected="true" data-target-updtext="#mobEntryDictName">English</a>
- </li>
- <li role="presentation">
- <a href="#dataset-american-english" id="aTabEntryamerican-english" class="js-trigger " data-tab="ds-american-english" role="tab" aria-selected="true" data-target-updtext="#mobEntryDictName">American</a>
- </li>
-
- <li role="presentation">
- <a href="#dataset-example" id="aTabEntryexample" data-tab="ds-example" class="js-trigger " role="tab" aria-selected="true" data-target-updtext="#mobEntryDictName">Examples</a>
- </li>
- </ul>
- </div>
-
- <div class="cdo-dblclick-area">
- <div class="di superentry" itemprop="text">
- <div class="di-head"><div class="di-title">
- <h2 class="hw" title="what is “love”?">
- "love" in English
- </h2>
- </div>
+</div></aside></div> </div>
+ </div>
+ </div>
+ <div class="entry-nav tabs__tabs js-tabs resp resp--med">
+ <ul role="tablist" data-tabs-count="3">
+ <li role="presentation">
+ <a href="#dataset-cald4" id="aTabEntrycald4" class="js-trigger on " data-tab="ds-cald4" role="tab" aria-selected="true" data-target-updtext="#mobEntryDictName">英语</a>
+ </li>
+ <li role="presentation">
+ <a href="#dataset-cacd" id="aTabEntrycacd" class="js-trigger " data-tab="ds-cacd" role="tab" aria-selected="true" data-target-updtext="#mobEntryDictName">美式</a>
+ </li>
+ <li role="presentation">
+ <a href="#dataset-examples" id="aTabEntryexamples" class="js-trigger " data-tab="ds-examples" role="tab" aria-selected="true" data-target-updtext="#mobEntryDictName">例句</a>
+ </li>
+ </ul>
+ </div>
+ <div class="link"><div class="di superentry" itemprop="text">
+ <div class="di-head"><div class="di-title">
+ <h2 class="hw" title="什么是“love”?">
+ “love”在英语词典中的解释及翻译
+ </h2>
+ </div>
- <a href="https://dictionary.cambridge.org/dictionary/english/love#translations" class="see-all-translations a--rev"><i class="fcdo fcdo-caret-right" aria-hidden="true"> </i><b>See all translations</b></a>
+ <a href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD/love#translations" class="see-all-translations a--rev"><i class="fcdo fcdo-caret-right" aria-hidden="true"> </i><b>查看所有翻译</b></a>
- </div>
- <div class="di-body"><div class="entry"><div class="entry-body"> <div class="entry-body__el clrd js-share-holder"><div class="pos-header">
- <div class="h3 di-title cdo-section-title-hw"><span class="headword"><span class="hw">love</span></span>
- <span class="posgram ico-bg"><span class="pos" title="A word that describes an action, condition or experience.">verb</span> <span class="gram"><a href="https://dictionary.cambridge.org/help/codes.html">[<span class="gcs"> <span title="Transitive verb: a verb that has an object." class="gc">T</span> </span>]</a></span></span>
+ </div>
+ <div class="di-body"><div class="entry"><div class="entry-body"> <div class="entry-body__el clrd js-share-holder"><div class="pos-header"><div class="h3 di-title cdo-section-title-hw"><span class="headword"><span class="hw">love</span></span>
+ <span class="posgram ico-bg"><span class="pos" title="A word that describes an action, condition or experience.">verb</span> <span class="gram"><a href="https://dictionary.cambridge.org/zhs/help/codes.html">[<span class="gcs"> <span class="gc">T</span> </span>]</a></span></span>
</div>
- <span class="pron-info"><span class="uk"><span class="region">uk</span>
- <span title="love: listen to British English pronunciation" data-src-mp3="https://dictionary.cambridge.org/media/english/uk_pron/u/ukl/uklou/ukloudn014.mp3" data-src-ogg="https://dictionary.cambridge.org/media/english/uk_pron_ogg/u/ukl/uklou/ukloudn014.ogg" class="circle circle-btn sound audio_play_button uk">
+ <span class="uk"><span class="region">uk</span>
+ <span title="love: listen to British English pronunciation" data-src-mp3="/zhs/media/%E8%8B%B1%E8%AF%AD/uk_pron/u/ukl/uklou/ukloudn014.mp3" data-src-ogg="/zhs/media/%E8%8B%B1%E8%AF%AD/uk_pron_ogg/u/ukl/uklou/ukloudn014.ogg" class="circle circle-btn sound audio_play_button">
<i class='fcdo fcdo-volume-up'>​</i>
</span>
- </span>
- <span class="uk"><span class="pron">/<span class="ipa">lʌv</span>/</span></span>
- </span><span class="pron-info"><span class="us"><span class="region">us</span>
- <span title="love: listen to American pronunciation" data-src-mp3="https://dictionary.cambridge.org/media/english/us_pron/l/lov/love_/love.mp3" data-src-ogg="https://dictionary.cambridge.org/media/english/us_pron_ogg/l/lov/love_/love.ogg" class="circle circle-btn sound audio_play_button us">
+ <span class="pron">/<span class="ipa">lʌv</span>/</span> </span><span class="us"><span class="region">us</span>
+ <span title="love: listen to American pronunciation" data-src-mp3="/zhs/media/%E8%8B%B1%E8%AF%AD/us_pron/l/lov/love_/love.mp3" data-src-ogg="/zhs/media/%E8%8B%B1%E8%AF%AD/us_pron_ogg/l/lov/love_/love.ogg" class="circle circle-btn sound audio_play_button">
<i class='fcdo fcdo-volume-up'>​</i>
</span>
- </span>
- <span class="uk"><span class="pron">/<span class="ipa">lʌv</span>/</span></span>
- </span>
+ <span class="pron">/<span class="ipa">lʌv</span>/</span> </span>
<div class="share rounded js-share">
<span class="point"></span>
- <a class="circle bg--fb socialShareLink" title="Share this entry on Facebook" href='https://www.facebook.com/sharer.php?u=https%3A%2F%2Fdictionary.cambridge.org%2Fdictionary%2Fenglish%2Flove&t=love+Meaning+in+the+Cambridge+English+Dictionary' target='_blank' data-social='facebook' data-url='https://www.facebook.com/sharer.php?u=https%3A%2F%2Fdictionary.cambridge.org%2Fdictionary%2Fenglish%2Flove&t=love+Meaning+in+the+Cambridge+English+Dictionary' data-object='entry'>
+ <a class="circle bg--fb socialShareLink" title="在Facebook上分享该词条" href='https://www.facebook.com/sharer.php?u=https%3A%2F%2Fdictionary.cambridge.org%2Fzhs%2F%25E8%25AF%258D%25E5%2585%25B8%2F%25E8%258B%25B1%25E8%25AF%25AD%2Flove&t=LOVE%E5%9C%A8%E5%89%91%E6%A1%A5%E8%8B%B1%E8%AF%AD%E8%AF%8D%E5%85%B8%E4%B8%AD%E7%9A%84%E8%A7%A3%E9%87%8A%E5%8F%8A%E7%BF%BB%E8%AF%91' target='_blank' data-social='facebook' data-url='https://www.facebook.com/sharer.php?u=https%3A%2F%2Fdictionary.cambridge.org%2Fzhs%2F%25E8%25AF%258D%25E5%2585%25B8%2F%25E8%258B%25B1%25E8%25AF%25AD%2Flove&t=LOVE%E5%9C%A8%E5%89%91%E6%A1%A5%E8%8B%B1%E8%AF%AD%E8%AF%8D%E5%85%B8%E4%B8%AD%E7%9A%84%E8%A7%A3%E9%87%8A%E5%8F%8A%E7%BF%BB%E8%AF%91' data-object='entry'>
<i class="fcdo fcdo-facebook" aria-hidden="true"></i>
</a>
- <a class="circle bg--tw socialShareLink" title="Tweet this entry" href='https://twitter.com/intent/tweet?url=https%3A%2F%2Fdictionary.cambridge.org%2Fdictionary%2Fenglish%2Flove&text=love+Meaning+in+the+Cambridge+English+Dictionary' target='_blank' data-social='twitter' data-url='https://twitter.com/intent/tweet?url=https%3A%2F%2Fdictionary.cambridge.org%2Fdictionary%2Fenglish%2Flove&text=love+Meaning+in+the+Cambridge+English+Dictionary' data-object='entry'>
+ <a class="circle bg--tw socialShareLink" title="用推特发送该页面" href='https://twitter.com/intent/tweet?url=https%3A%2F%2Fdictionary.cambridge.org%2Fzhs%2F%25E8%25AF%258D%25E5%2585%25B8%2F%25E8%258B%25B1%25E8%25AF%25AD%2Flove&text=LOVE%E5%9C%A8%E5%89%91%E6%A1%A5%E8%8B%B1%E8%AF%AD%E8%AF%8D%E5%85%B8%E4%B8%AD%E7%9A%84%E8%A7%A3%E9%87%8A%E5%8F%8A%E7%BF%BB%E8%AF%91' target='_blank' data-social='twitter' data-url='https://twitter.com/intent/tweet?url=https%3A%2F%2Fdictionary.cambridge.org%2Fzhs%2F%25E8%25AF%258D%25E5%2585%25B8%2F%25E8%258B%25B1%25E8%25AF%25AD%2Flove&text=LOVE%E5%9C%A8%E5%89%91%E6%A1%A5%E8%8B%B1%E8%AF%AD%E8%AF%8D%E5%85%B8%E4%B8%AD%E7%9A%84%E8%A7%A3%E9%87%8A%E5%8F%8A%E7%BF%BB%E8%AF%91' data-object='entry'>
<i class="fcdo fcdo-twitter" aria-hidden="true"></i>
</a>
- <a class="circle bg--more js-accord" title="More" href="#" >
+ <a class="circle bg--more js-accord" title="更多" href="#" >
<i class="fcdo fcdo-plus"></i>
<i class="fcdo fcdo-minus"></i>
</a>
<div class="oflow-hide js-share-toggle">
- <a class="circle bg--gp socialShareLink" title="Share this entry on Google+" href='https://plus.google.com/share?url=https%3A%2F%2Fdictionary.cambridge.org%2Fdictionary%2Fenglish%2Flove' target='_blank' data-social='google' data-url='https://plus.google.com/share?url=https%3A%2F%2Fdictionary.cambridge.org%2Fdictionary%2Fenglish%2Flove' data-object='entry'>
+ <a class="circle bg--gp socialShareLink" title="在Google+上分享该词条" href='https://plus.google.com/share?url=https%3A%2F%2Fdictionary.cambridge.org%2Fzhs%2F%25E8%25AF%258D%25E5%2585%25B8%2F%25E8%258B%25B1%25E8%25AF%25AD%2Flove' target='_blank' data-social='google' data-url='https://plus.google.com/share?url=https%3A%2F%2Fdictionary.cambridge.org%2Fzhs%2F%25E8%25AF%258D%25E5%2585%25B8%2F%25E8%258B%25B1%25E8%25AF%25AD%2Flove' data-object='entry'>
<i class="fcdo fcdo-google-plus" aria-hidden="true"></i>
</a>
- <a class="circle bg--di socialShareLink" title="Share this entry on Diigo" href='https://www.diigo.com/post?url=https%3A%2F%2Fdictionary.cambridge.org%2Fdictionary%2Fenglish%2Flove&title=love+Meaning+in+the+Cambridge+English+Dictionary' target='_blank' data-social='diigo' data-url='https://www.diigo.com/post?url=https%3A%2F%2Fdictionary.cambridge.org%2Fdictionary%2Fenglish%2Flove&title=love+Meaning+in+the+Cambridge+English+Dictionary' data-object='entry'>
+ <a class="circle bg--di socialShareLink" title="在Diigo上分享该词条" href='https://www.diigo.com/post?url=https%3A%2F%2Fdictionary.cambridge.org%2Fzhs%2F%25E8%25AF%258D%25E5%2585%25B8%2F%25E8%258B%25B1%25E8%25AF%25AD%2Flove&title=LOVE%E5%9C%A8%E5%89%91%E6%A1%A5%E8%8B%B1%E8%AF%AD%E8%AF%8D%E5%85%B8%E4%B8%AD%E7%9A%84%E8%A7%A3%E9%87%8A%E5%8F%8A%E7%BF%BB%E8%AF%91' target='_blank' data-social='diigo' data-url='https://www.diigo.com/post?url=https%3A%2F%2Fdictionary.cambridge.org%2Fzhs%2F%25E8%25AF%258D%25E5%2585%25B8%2F%25E8%258B%25B1%25E8%25AF%25AD%2Flove&title=LOVE%E5%9C%A8%E5%89%91%E6%A1%A5%E8%8B%B1%E8%AF%AD%E8%AF%8D%E5%85%B8%E4%B8%AD%E7%9A%84%E8%A7%A3%E9%87%8A%E5%8F%8A%E7%BF%BB%E8%AF%91' data-object='entry'>
<i class="fcdo fcdo-diigo" aria-hidden="true"></i>
</a>
- <a class="circle bg--su socialShareLink" title="Share this entry on StumbleUpon" href='https://www.stumbleupon.com/likecontent?url=https%3A%2F%2Fdictionary.cambridge.org%2Fdictionary%2Fenglish%2Flove&title=love+Meaning+in+the+Cambridge+English+Dictionary' target='_blank' data-social='stumbleupon' data-url='https://www.stumbleupon.com/likecontent?url=https%3A%2F%2Fdictionary.cambridge.org%2Fdictionary%2Fenglish%2Flove&title=love+Meaning+in+the+Cambridge+English+Dictionary' data-object='entry'>
- <i class="fcdo fcdo-stumbleupon" aria-hidden="true"></i>
- </a>
- <a class="circle bg--tu socialShareLink" title="Share this entry on Tumblr" href='https://www.tumblr.com/share/link?url=https%3A%2F%2Fdictionary.cambridge.org%2Fdictionary%2Fenglish%2Flove&name=love+Meaning+in+the+Cambridge+English+Dictionary' target='_blank' data-social='tumblr' data-url='https://www.tumblr.com/share/link?url=https%3A%2F%2Fdictionary.cambridge.org%2Fdictionary%2Fenglish%2Flove&name=love+Meaning+in+the+Cambridge+English+Dictionary' data-object='entry'>
+ <a class="circle bg--tu socialShareLink" title="在Tumblr上分享该词条" href='https://www.tumblr.com/share/link?url=https%3A%2F%2Fdictionary.cambridge.org%2Fzhs%2F%25E8%25AF%258D%25E5%2585%25B8%2F%25E8%258B%25B1%25E8%25AF%25AD%2Flove&name=LOVE%E5%9C%A8%E5%89%91%E6%A1%A5%E8%8B%B1%E8%AF%AD%E8%AF%8D%E5%85%B8%E4%B8%AD%E7%9A%84%E8%A7%A3%E9%87%8A%E5%8F%8A%E7%BF%BB%E8%AF%91' target='_blank' data-social='tumblr' data-url='https://www.tumblr.com/share/link?url=https%3A%2F%2Fdictionary.cambridge.org%2Fzhs%2F%25E8%25AF%258D%25E5%2585%25B8%2F%25E8%258B%25B1%25E8%25AF%25AD%2Flove&name=LOVE%E5%9C%A8%E5%89%91%E6%A1%A5%E8%8B%B1%E8%AF%AD%E8%AF%8D%E5%85%B8%E4%B8%AD%E7%9A%84%E8%A7%A3%E9%87%8A%E5%8F%8A%E7%BF%BB%E8%AF%91' data-object='entry'>
<i class="fcdo fcdo-tumblr" aria-hidden="true"></i>
</a>
- <a class="circle bg--re socialShareLink" title="Share this entry on Reddit" href='https://www.reddit.com/submit?url=https%3A%2F%2Fdictionary.cambridge.org%2Fdictionary%2Fenglish%2Flove&title=love+Meaning+in+the+Cambridge+English+Dictionary' target='_blank' data-social='reddit' data-url='https://www.reddit.com/submit?url=https%3A%2F%2Fdictionary.cambridge.org%2Fdictionary%2Fenglish%2Flove&title=love+Meaning+in+the+Cambridge+English+Dictionary' data-object='entry'>
+ <a class="circle bg--re socialShareLink" title="在Reddit上分享该词条" href='https://www.reddit.com/submit?url=https%3A%2F%2Fdictionary.cambridge.org%2Fzhs%2F%25E8%25AF%258D%25E5%2585%25B8%2F%25E8%258B%25B1%25E8%25AF%25AD%2Flove&title=LOVE%E5%9C%A8%E5%89%91%E6%A1%A5%E8%8B%B1%E8%AF%AD%E8%AF%8D%E5%85%B8%E4%B8%AD%E7%9A%84%E8%A7%A3%E9%87%8A%E5%8F%8A%E7%BF%BB%E8%AF%91' target='_blank' data-social='reddit' data-url='https://www.reddit.com/submit?url=https%3A%2F%2Fdictionary.cambridge.org%2Fzhs%2F%25E8%25AF%258D%25E5%2585%25B8%2F%25E8%258B%25B1%25E8%25AF%25AD%2Flove&title=LOVE%E5%9C%A8%E5%89%91%E6%A1%A5%E8%8B%B1%E8%AF%AD%E8%AF%8D%E5%85%B8%E4%B8%AD%E7%9A%84%E8%A7%A3%E9%87%8A%E5%8F%8A%E7%BF%BB%E8%AF%91' data-object='entry'>
<i class="fcdo fcdo-reddit-alien" aria-hidden="true"></i>
</a>
- <a class="circle bg--def socialShareLink" title="Share this url" dsp-txt='https://dictionary.cambridge.org/dictionary/english/love' data-social='url' data-url='https://dictionary.cambridge.org/dictionary/english/love' data-object='entry'>
+ <a class="circle bg--def socialShareLink" title="分享这个链接" dsp-txt='https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD/love' data-social='url' data-url='https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD/love' data-object='entry'>
<i class="fcdo fcdo-link" aria-hidden="true"></i>
</a>
</div>
</div>
</div><div class="pos-body">
- <div class="sense-block" id="british-1-1-1">
-
- <h3 class="txt-block txt-block--alt2"><span class="hw">love</span> <span class="pos" title="A word that describes an action, condition or experience.">verb</span> <span class="gram"><a href="https://dictionary.cambridge.org/help/codes.html">[<span class="gcs"> <span title="Transitive verb: a verb that has an object." class="gc">T</span> </span>]</a></span> <span class="guideword" title="Guide word: helps you find the right meaning when a word has more than one meaning">
+ <div class="sense-block" id="cald4-1-1-1"> <h3 class="txt-block txt-block--alt2"><span class="hw">love</span> <span class="pos" title="A word that describes an action, condition or experience.">verb</span> <span class="gram"><a href="https://dictionary.cambridge.org/zhs/help/codes.html">[<span class="gcs"> <span class="gc">T</span> </span>]</a></span> <span class="guideword" title="Guide word: helps you find the right meaning when a word has more than one meaning">
(<span>LIKE SOMEONE</span>)
- </span></h3>
- <div class="sense-body">
- <div class="def-block pad-indent" data-wl-senseid="ID_00019069_01"><p class="def-head semi-flush"><span class="def-info"><span title="A1: Beginner level. English Vocabulary Profile symbols A1-C2 show which words and phrases learners know at each level." class="epp-xref A1">A1</span> </span><b class="def">to like another <a class="query" href="https://dictionary.cambridge.org/dictionary/english/adult" title="adult">adult</a> very much and be <a class="query" href="https://dictionary.cambridge.org/dictionary/english/romantic" title="romantically">romantically</a> and <a class="query" href="https://dictionary.cambridge.org/dictionary/english/sexually" title="sexually">sexually</a> <a class="query" href="https://dictionary.cambridge.org/dictionary/english/attract" title="attracted">attracted</a> to them, or to have <a class="query" href="https://dictionary.cambridge.org/dictionary/english/strong" title="strong">strong</a> <a class="query" href="https://dictionary.cambridge.org/dictionary/english/feeling" title="feelings">feelings</a> of <a class="query" href="https://dictionary.cambridge.org/dictionary/english/liking" title="liking">liking</a> a <a class="query" href="https://dictionary.cambridge.org/dictionary/english/friend" title="friend">friend</a> or <a class="query" href="https://dictionary.cambridge.org/dictionary/english/person" title="person">person</a> in <a class="query" href="https://dictionary.cambridge.org/dictionary/english/your" title="your">your</a> <a class="query" href="https://dictionary.cambridge.org/dictionary/english/family" title="family">family</a>: </b></p><span class="def-body"><div class="examp emphasized"><span title="Example" class="eg">I love you.</span></div><div class="examp emphasized"> <span title="Example" class="eg">Last <a class="query" href="https://dictionary.cambridge.org/dictionary/english/night" title="night">night</a> he told me he loved me.</span></div><div class="examp emphasized"> <span title="Example" class="eg">I've only <a class="query" href="https://dictionary.cambridge.org/dictionary/english/ever" title="ever">ever</a> loved one man.</span></div><div class="examp emphasized"> <span title="Example" class="eg">I'm <a class="query" href="https://dictionary.cambridge.org/dictionary/english/sure" title="sure">sure</a> he loves his <a class="query" href="https://dictionary.cambridge.org/dictionary/english/kid" title="kids">kids</a>.</span></div></span></div>
+ </span></h3> <div class="sense-body">
+ <div class="def-block pad-indent" data-wl-senseid="ID_00019069_01"><p class="def-head semi-flush"><span class="def-info"><span class="epp-xref A1">A1</span> </span><b class="def">to like another <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD/adult" title="adult">adult</a> very much and be <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD/romantic" title="romantically">romantically</a> and <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD/sexually" title="sexually">sexually</a> <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD/attract" title="attracted">attracted</a> to them, or to have <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD/strong" title="strong">strong</a> <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD/feeling" title="feelings">feelings</a> of <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD/like" title="liking">liking</a> a <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD/friend" title="friend">friend</a> or <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD/person" title="person">person</a> in <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD/your" title="your">your</a> <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD/family" title="family">family</a>: </b></p><span class="def-body"><div class="examp emphasized"><span class="eg">I love you.</span></div><div class="examp emphasized"> <span class="eg">Last <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD/night" title="night">night</a> he told me he loved me.</span></div><div class="examp emphasized"> <span class="eg">I've only <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD/ever" title="ever">ever</a> loved one man.</span></div><div class="examp emphasized"> <span class="eg">I'm <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD/sure" title="sure">sure</a> he loves his <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD/kid" title="kids">kids</a>.</span></div></span></div>
- <div class="extraexamps"><p class="accord-basic js-accord accord-basic--shallow">More examples</p><ul class="unstyled emphasized pad-indent"><li class="eg">You may love someone without <a class="query" href="https://dictionary.cambridge.org/dictionary/english/necessarily" title="necessarily">necessarily</a> <a class="query" href="https://dictionary.cambridge.org/dictionary/english/wanting" title="wanting">wanting</a> to <a class="query" href="https://dictionary.cambridge.org/dictionary/english/marry" title="marry">marry</a> them.</li><li class="eg">He said he would always love her .</li><li class="eg">I <a class="query" href="https://dictionary.cambridge.org/dictionary/english/think" title="think">think</a> Phil has to <a class="query" href="https://dictionary.cambridge.org/dictionary/english/face" title="face">face</a> the <a class="query" href="https://dictionary.cambridge.org/dictionary/english/fact" title="fact">fact</a> that she no <a class="query" href="https://dictionary.cambridge.org/dictionary/english/long" title="longer">longer</a> loves him.</li><li class="eg">She <a class="query" href="https://dictionary.cambridge.org/dictionary/english/face" title="faces">faces</a> the <a class="query" href="https://dictionary.cambridge.org/dictionary/english/dilemma" title="dilemma">dilemma</a> of <a class="query" href="https://dictionary.cambridge.org/dictionary/english/disobey" title="disobeying">disobeying</a> her <a class="query" href="https://dictionary.cambridge.org/dictionary/english/father" title="father">father</a> or <a class="query" href="https://dictionary.cambridge.org/dictionary/english/losing" title="losing">losing</a> the man she loves.</li><li class="eg">When I <a class="query" href="https://dictionary.cambridge.org/dictionary/english/tried" title="tried">tried</a> to <a class="query" href="https://dictionary.cambridge.org/dictionary/english/tell" title="tell">tell</a> her that I loved her it just came out all <a class="query" href="https://dictionary.cambridge.org/dictionary/english/wrong" title="wrong">wrong</a>.</li></ul></div>
+ <div class="extraexamps"><p class="accord-basic js-accord accord-basic--shallow">更多范例</p><ul class="unstyled emphasized pad-indent"><li class="eg">You may love someone without <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD/necessarily" title="necessarily">necessarily</a> <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD/wanting" title="wanting">wanting</a> to <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD/marry" title="marry">marry</a> them.</li><li class="eg">He said he would always love her .</li><li class="eg">I <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD/think" title="think">think</a> Phil has to <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD/face" title="face">face</a> the <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD/fact" title="fact">fact</a> that she no <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD/long" title="longer">longer</a> loves him.</li><li class="eg">She <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD/face" title="faces">faces</a> the <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD/dilemma" title="dilemma">dilemma</a> of <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD/disobey" title="disobeying">disobeying</a> her <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD/father" title="father">father</a> or <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD/losing" title="losing">losing</a> the man she loves.</li><li class="eg">When I <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD/tried" title="tried">tried</a> to <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD/tell" title="tell">tell</a> her that I loved her it just came out all <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD/wrong" title="wrong">wrong</a>.</li></ul></div>
</div>
-
<div class="smartt">
- <p class="accord-basic js-accord accord-basic--shallow">Thesaurus: synonyms and related words</p>
- <div>
- <p>
- <a href="https://dictionary.cambridge.org/topics/liking-and-attractiveness/loving-and-in-love/" class="cdo-topic cdo-link" title="Synonyms and related words for love in the Loving and in love topic">Loving and in love</a>
- </p>
- <div class="txt-block cloud rounded">
- <div class="cdo-cloud-content">
- <ul class="unstyled inline">
- <li>
- <a title="absence" class="topic_0 odd " href=" https://dictionary.cambridge.org/dictionary/british/absence?topic=loving-and-in-love ">
- <span class="results"><span class="base"><b class="hw">absence</b></span></span>
- </a>
- </li>
- <li>
- <a title="absence makes the heart grow fonder idiom" class="topic_0 even " href=" https://dictionary.cambridge.org/dictionary/british/absence-makes-the-heart-grow-fonder?topic=loving-and-in-love ">
- <span class="results"><span class="base"><b class="phrase">absence makes the heart grow fonder</b></span> <span class="pos">idiom</span> </span>
- </a>
- </li>
- <li>
- <a title="adoring" class="topic_0 odd " href=" https://dictionary.cambridge.org/dictionary/british/adoring?topic=loving-and-in-love ">
- <span class="results"><span class="base"><b class="hw">adoring</b></span></span>
- </a>
- </li>
- <li>
- <a title="affection" class="topic_0 even " href=" https://dictionary.cambridge.org/dictionary/british/affection?topic=loving-and-in-love ">
- <span class="results"><span class="base"><b class="hw">affection</b></span></span>
- </a>
- </li>
- <li>
- <a title="apple" class="topic_0 odd " href=" https://dictionary.cambridge.org/dictionary/british/apple?topic=loving-and-in-love ">
- <span class="results"><span class="base"><b class="hw">apple</b></span></span>
- </a>
- </li>
- <li>
- <a title="dear" class="topic_3 even " href=" https://dictionary.cambridge.org/dictionary/british/dear?topic=loving-and-in-love ">
- <span class="results"><span class="base"><b class="hw">dear</b></span></span>
- </a>
- </li>
- <li>
- <a title="fall in love idiom" class="topic_1 odd " href=" https://dictionary.cambridge.org/dictionary/british/fall-in-love?topic=loving-and-in-love ">
- <span class="results"><span class="base"><b class="phrase">fall in love</b></span> <span class="pos">idiom</span> </span>
- </a>
- </li>
- <li>
- <a title="fondly" class="topic_1 even " href=" https://dictionary.cambridge.org/dictionary/british/fondly?topic=loving-and-in-love ">
- <span class="results"><span class="base"><b class="hw">fondly</b></span></span>
- </a>
- </li>
- <li>
- <a title="gaga" class="topic_3 odd " href=" https://dictionary.cambridge.org/dictionary/british/gaga?topic=loving-and-in-love ">
- <span class="results"><span class="base"><b class="hw">gaga</b></span></span>
- </a>
- </li>
- <li>
- <a title="have (got) it bad idiom" class="topic_1 even " href=" https://dictionary.cambridge.org/dictionary/british/have-got-it-bad?topic=loving-and-in-love ">
- <span class="results"><span class="base"><b class="phrase">have (got) it bad</b></span> <span class="pos">idiom</span> </span>
- </a>
- </li>
- <li>
- <a title="head over heels (in love) idiom" class="topic_1 odd " href=" https://dictionary.cambridge.org/dictionary/british/head-over-heels-in-love?topic=loving-and-in-love ">
- <span class="results"><span class="base"><b class="phrase">head over heels (in love)</b></span> <span class="pos">idiom</span> </span>
- </a>
- </li>
- <li>
- <a title="infatuated" class="topic_1 even " href=" https://dictionary.cambridge.org/dictionary/british/infatuated?topic=loving-and-in-love ">
- <span class="results"><span class="base"><b class="hw">infatuated</b></span></span>
- </a>
- </li>
- <li>
- <a title="lose" class="topic_3 odd " href=" https://dictionary.cambridge.org/dictionary/british/lose?topic=loving-and-in-love ">
- <span class="results"><span class="base"><b class="hw">lose</b></span></span>
- </a>
- </li>
- <li>
- <a title="moon over sb/sth" class="topic_2 even " href=" https://dictionary.cambridge.org/dictionary/british/moon-over-sb-sth?topic=loving-and-in-love ">
- <span class="results"><span class="base"><b class="phrase">moon over <i class="obj" title="sb/sth: abbreviation for somebody or something.">sb/sth</i></b></span></span>
- </a>
- </li>
- <li>
- <a title="puppy love" class="topic_2 odd " href=" https://dictionary.cambridge.org/dictionary/british/puppy-love?topic=loving-and-in-love ">
- <span class="results"><span class="base"><b class="hw">puppy love</b></span></span>
- </a>
- </li>
- <li>
- <a title="romance" class="topic_3 even " href=" https://dictionary.cambridge.org/dictionary/british/romance?topic=loving-and-in-love ">
- <span class="results"><span class="base"><b class="hw">romance</b></span></span>
- </a>
- </li>
- <li>
- <a title="romantic" class="topic_2 odd " href=" https://dictionary.cambridge.org/dictionary/british/romantic?topic=loving-and-in-love ">
- <span class="results"><span class="base"><b class="hw">romantic</b></span></span>
- </a>
- </li>
- <li>
- <a title="shine" class="topic_3 even " href=" https://dictionary.cambridge.org/dictionary/british/shine?topic=loving-and-in-love ">
- <span class="results"><span class="base"><b class="hw">shine</b></span></span>
- </a>
- </li>
- <li>
- <a title="smitten" class="topic_2 odd " href=" https://dictionary.cambridge.org/dictionary/british/smitten?topic=loving-and-in-love ">
- <span class="results"><span class="base"><b class="hw">smitten</b></span></span>
- </a>
- </li>
- <li>
- <a title="stuck" class="topic_2 even " href=" https://dictionary.cambridge.org/dictionary/british/stuck?topic=loving-and-in-love ">
- <span class="results"><span class="base"><b class="hw">stuck</b></span></span>
- </a>
- </li>
- </ul>
- </div>
- <p><a href="https://dictionary.cambridge.org/topics/liking-and-attractiveness/loving-and-in-love/" title="Synonyms and related words for love in the Loving and in love topic"><b>See more results »</b></a></p>
+ <p class="accord-basic js-accord accord-basic--shallow">词库：同义词和关联词</p>
+ <div>
+ <p>
+ <a href="https://dictionary.cambridge.org/zhs/topics/liking-and-attractiveness/loving-and-in-love/" class="cdo-topic cdo-link" title="在Loving and in love话题中love的同义词和相关词">Loving and in love</a>
+ </p>
+ <div class="txt-block cloud rounded">
+ <div class="cdo-cloud-content">
+ <ul class="unstyled inline">
+ <li>
+ <a title="absence" class="topic_0 odd " href=" https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD/absence?topic=loving-and-in-love ">
+ <span class="results"><span class="base"><b class="hw">absence</b></span></span>
+ </a>
+ </li>
+ <li>
+ <a title="absence makes the heart grow fonder idiom" class="topic_0 even " href=" https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD/absence-makes-the-heart-grow-fonder?topic=loving-and-in-love ">
+ <span class="results"><span class="base"><b class="phrase">absence makes the heart grow fonder</b></span> <span class="pos">idiom</span> </span>
+ </a>
+ </li>
+ <li>
+ <a title="adoring" class="topic_0 odd " href=" https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD/adoring?topic=loving-and-in-love ">
+ <span class="results"><span class="base"><b class="hw">adoring</b></span></span>
+ </a>
+ </li>
+ <li>
+ <a title="affection" class="topic_0 even " href=" https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD/affection?topic=loving-and-in-love ">
+ <span class="results"><span class="base"><b class="hw">affection</b></span></span>
+ </a>
+ </li>
+ <li>
+ <a title="apple" class="topic_0 odd " href=" https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD/apple?topic=loving-and-in-love ">
+ <span class="results"><span class="base"><b class="hw">apple</b></span></span>
+ </a>
+ </li>
+ <li>
+ <a title="dear" class="topic_3 even " href=" https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD/dear?topic=loving-and-in-love ">
+ <span class="results"><span class="base"><b class="hw">dear</b></span></span>
+ </a>
+ </li>
+ <li>
+ <a title="fondly" class="topic_1 odd " href=" https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD/fondly?topic=loving-and-in-love ">
+ <span class="results"><span class="base"><b class="hw">fondly</b></span></span>
+ </a>
+ </li>
+ <li>
+ <a title="gaga" class="topic_3 even " href=" https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD/gaga?topic=loving-and-in-love ">
+ <span class="results"><span class="base"><b class="hw">gaga</b></span></span>
+ </a>
+ </li>
+ <li>
+ <a title="have (got) it bad idiom" class="topic_1 odd " href=" https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD/have-got-it-bad?topic=loving-and-in-love ">
+ <span class="results"><span class="base"><b class="phrase">have (got) it bad</b></span> <span class="pos">idiom</span> </span>
+ </a>
+ </li>
+ <li>
+ <a title="head over heels (in love) idiom" class="topic_1 even " href=" https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD/head-over-heels-in-love?topic=loving-and-in-love ">
+ <span class="results"><span class="base"><b class="phrase">head over heels (in love)</b></span> <span class="pos">idiom</span> </span>
+ </a>
+ </li>
+ <li>
+ <a title="infatuated" class="topic_1 odd " href=" https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD/infatuated?topic=loving-and-in-love ">
+ <span class="results"><span class="base"><b class="hw">infatuated</b></span></span>
+ </a>
+ </li>
+ <li>
+ <a title="infatuation" class="topic_1 even " href=" https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD/infatuation?topic=loving-and-in-love ">
+ <span class="results"><span class="base"><b class="hw">infatuation</b></span></span>
+ </a>
+ </li>
+ <li>
+ <a title="lose" class="topic_3 odd " href=" https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD/lose?topic=loving-and-in-love ">
+ <span class="results"><span class="base"><b class="hw">lose</b></span></span>
+ </a>
+ </li>
+ <li>
+ <a title="potty" class="topic_2 even " href=" https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD/potty?topic=loving-and-in-love ">
+ <span class="results"><span class="base"><b class="hw">potty</b></span></span>
+ </a>
+ </li>
+ <li>
+ <a title="puppy love" class="topic_2 odd " href=" https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD/puppy-love?topic=loving-and-in-love ">
+ <span class="results"><span class="base"><b class="hw">puppy love</b></span></span>
+ </a>
+ </li>
+ <li>
+ <a title="romance" class="topic_3 even " href=" https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD/romance?topic=loving-and-in-love ">
+ <span class="results"><span class="base"><b class="hw">romance</b></span></span>
+ </a>
+ </li>
+ <li>
+ <a title="romantic" class="topic_2 odd " href=" https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD/romantic?topic=loving-and-in-love ">
+ <span class="results"><span class="base"><b class="hw">romantic</b></span></span>
+ </a>
+ </li>
+ <li>
+ <a title="shine" class="topic_3 even " href=" https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD/shine?topic=loving-and-in-love ">
+ <span class="results"><span class="base"><b class="hw">shine</b></span></span>
+ </a>
+ </li>
+ <li>
+ <a title="smitten" class="topic_2 odd " href=" https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD/smitten?topic=loving-and-in-love ">
+ <span class="results"><span class="base"><b class="hw">smitten</b></span></span>
+ </a>
+ </li>
+ <li>
+ <a title="stuck" class="topic_2 even " href=" https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD/stuck?topic=loving-and-in-love ">
+ <span class="results"><span class="base"><b class="hw">stuck</b></span></span>
+ </a>
+ </li>
+ </ul>
+ </div>
+ <p><a href="https://dictionary.cambridge.org/zhs/topics/liking-and-attractiveness/loving-and-in-love/" title="在Loving and in love话题中love的同义词和相关词"><b>查看更多结果»</b></a></p>
+ </div>
+
</div>
+ </div>
+ </div>
- </div>
+ <div class="sense-block" id="cald4-1-1-2"> <h3 class="txt-block txt-block--alt2"><span class="hw">love</span> <span class="pos" title="A word that describes an action, condition or experience.">verb</span> <span class="gram"><a href="https://dictionary.cambridge.org/zhs/help/codes.html">[<span class="gcs"> <span class="gc">T</span> </span>]</a></span> <span class="guideword" title="Guide word: helps you find the right meaning when a word has more than one meaning">
+ (<span>LIKE SOMETHING</span>)
+ </span></h3> <div class="sense-body">
+ <div class="def-block pad-indent" data-wl-senseid="ID_00019069_02"><p class="def-head semi-flush"><span class="def-info"><span class="epp-xref A1">A1</span> </span><b class="def">to like something very much: </b></p><span class="def-body"><div class="examp emphasized"><span class="eg">She loves <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD/animal" title="animals">animals</a>.</span></div><div class="examp emphasized"> <span class="eg">I <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD/absolutely" title="absolutely">absolutely</a> love <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD/chocolate" title="chocolate">chocolate</a>.</span></div><div class="examp emphasized"> <span class="eg">He really loves his <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD/job" title="job">job</a>.</span></div><div class="examp emphasized"> <span class="gram"><a href="https://dictionary.cambridge.org/zhs/help/codes.html">[<span class="gcs"> <span class="gc">+ -ing verb</span> </span>]</a></span> <span class="eg">I love <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD/ski" title="ski">ski</a><b class="b">ing</b>.</span></div><div class="examp emphasized"> <span class="eg">Love it or <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD/hate" title="hate">hate</a> it, <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD/reality" title="reality">reality</a> TV is here to <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD/stay" title="stay">stay</a>.</span></div></span></div>
+ <div class="phrase-block pad-indent"><span class="phrase-head"><span class="phrase-title"><b class="phrase">would love</b></span></span><div class="phrase-body pad-indent">
+ <div class="def-block pad-indent" data-wl-senseid="ID_00019069_03"><p class="def-head semi-flush"><span class="def-info"><span class="epp-xref A2">A2</span> </span><b class="def">used, often in <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD/request" title="requests">requests</a>, to say that you would very much like something: </b></p><span class="def-body"><div class="examp emphasized"><span class="eg">I'd love a <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD/cup" title="cup">cup</a> of <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD/coffee" title="coffee">coffee</a> if you're making one.</span></div><div class="examp emphasized"> <span class="gram"><a href="https://dictionary.cambridge.org/zhs/help/codes.html">[<span class="gcs"> <span class="gc">+ to infinitive</span> </span>]</a></span> <span class="eg">She would <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD/dearly" title="dearly">dearly</a> love <b class="b">to</b> <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD/start" title="start">start</a> her own <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD/business" title="business">business</a>.</span></div><div class="examp emphasized"><span class="lab"><span class="region">UK</span></span> <span class="eg">I'd love you <b class="b">to</b> come to <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD/dinner" title="dinner">dinner</a> next <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD/week" title="week">week</a>.</span></div><div class="examp emphasized"><span class="lab"><span class="region">US</span></span> <span class="eg">I'd love <b class="b">for</b> you <b class="b">to</b> come to <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD/dinner" title="dinner">dinner</a> next <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD/week" title="week">week</a>.</span></div></span></div>
+ </div></div>
+ <div class="extraexamps"><p class="accord-basic js-accord accord-basic--shallow">更多范例</p><ul class="unstyled emphasized pad-indent"><li class="eg">We would <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD/dearly" title="dearly">dearly</a> love to <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD/sell" title="sell">sell</a> <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD/our" title="our">our</a> <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD/flat" title="flat">flat</a> and <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD/move" title="move">move</a> to the <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD/country" title="country">country</a>.</li><li class="eg">The <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD/kid" title="kids">kids</a> love <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD/feeding" title="feeding">feeding</a> <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD/bread" title="bread">bread</a> to the <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD/duck" title="ducks">ducks</a>.</li><li class="eg">I love <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD/friday" title="Fridays">Fridays</a> because I <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD/leave" title="leave">leave</a> <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD/work" title="work">work</a> early.</li><li class="eg">I've never been <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD/keen" title="keen">keen</a> on <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD/classical" title="classical">classical</a> <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD/music" title="music">music</a>, but I love <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD/jazz" title="jazz">jazz</a>.</li><li class="eg">I'd love to go to <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD/australia" title="Australia">Australia</a>. I only <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD/wish" title="wish">wish</a> I could <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD/afford" title="afford">afford</a> to.</li></ul></div>
</div>
- </div>
+ <div class="smartt">
+ <p class="accord-basic js-accord accord-basic--shallow">词库：同义词和关联词</p>
+ <div>
+ <p>
+ <a href="https://dictionary.cambridge.org/zhs/topics/liking-and-attractiveness/liking/" class="cdo-topic cdo-link" title="在Liking话题中love的同义词和相关词">Liking</a>
+ </p>
+ <div class="txt-block cloud rounded">
+ <div class="cdo-cloud-content">
+ <ul class="unstyled inline">
+ <li>
+ <a title="affection" class="topic_0 odd " href=" https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD/affection?topic=liking ">
+ <span class="results"><span class="base"><b class="hw">affection</b></span></span>
+ </a>
+ </li>
+ <li>
+ <a title="attached" class="topic_0 even " href=" https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD/attached?topic=liking ">
+ <span class="results"><span class="base"><b class="hw">attached</b></span></span>
+ </a>
+ </li>
+ <li>
+ <a title="be a glutton for sth idiom" class="topic_0 odd " href=" https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD/be-a-glutton-for-sth?topic=liking ">
+ <span class="results"><span class="base"><b class="phrase">be a glutton for <i title="sth: abbreviation for something." class="obj">sth</i></b></span> <span class="pos">idiom</span> </span>
+ </a>
+ </li>
+ <li>
+ <a title="be a hit with sb idiom" class="topic_0 even " href=" https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD/be-a-hit-with-sb?topic=liking ">
+ <span class="results"><span class="base"><b class="phrase">be a hit with <i title="sb: abbreviation for somebody." class="obj">sb</i></b></span> <span class="pos">idiom</span> </span>
+ </a>
+ </li>
+ <li>
+ <a title="be big on sth idiom" class="topic_0 odd " href=" https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD/be-big-on-sth?topic=liking ">
+ <span class="results"><span class="base"><b class="phrase">be big on <i title="sth: abbreviation for something." class="obj">sth</i></b></span> <span class="pos">idiom</span> </span>
+ </a>
+ </li>
+ <li>
+ <a title="grow" class="topic_3 even " href=" https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD/grow?topic=liking ">
+ <span class="results"><span class="base"><b class="hw">grow</b></span></span>
+ </a>
+ </li>
+ <li>
+ <a title="have a lot of time for sb idiom" class="topic_1 odd " href=" https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD/have-a-lot-of-time-for-sb?topic=liking ">
+ <span class="results"><span class="base"><b class="phrase">have a lot of time for <i title="sb: abbreviation for somebody." class="obj">sb</i></b></span> <span class="pos">idiom</span> </span>
+ </a>
+ </li>
+ <li>
+ <a title="have a thing about sth/sb idiom" class="topic_1 even " href=" https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD/have-a-thing-about-sth-sb?topic=liking ">
+ <span class="results"><span class="base"><b class="phrase">have a thing about <i class="obj">sth/sb</i></b></span> <span class="pos">idiom</span> </span>
+ </a>
+ </li>
+ <li>
+ <a title="heart" class="topic_3 odd " href=" https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD/heart?topic=liking ">
+ <span class="results"><span class="base"><b class="hw">heart</b></span></span>
+ </a>
+ </li>
+ <li>
+ <a title="lick your lips idiom" class="topic_1 even " href=" https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD/lick-your-lips?topic=liking ">
+ <span class="results"><span class="base"><b class="phrase">lick <i title="You can use my, your, their, etc. here" class="obj">your</i> lips</b></span> <span class="pos">idiom</span> </span>
+ </a>
+ </li>
+ <li>
+ <a title="liking" class="topic_1 odd " href=" https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD/liking?topic=liking ">
+ <span class="results"><span class="base"><b class="hw">liking</b></span></span>
+ </a>
+ </li>
+ <li>
+ <a title="look kindly on sb/sth idiom" class="topic_1 even " href=" https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD/look-kindly-on-sb-sth?topic=liking ">
+ <span class="results"><span class="base"><b class="phrase">look kindly on <i title="sb/sth: abbreviation for somebody or something." class="obj">sb/sth</i></b></span> <span class="pos">idiom</span> </span>
+ </a>
+ </li>
+ <li>
+ <a title="smile on sth/sb" class="topic_2 odd " href=" https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD/smile-on-sth-sb?topic=liking ">
+ <span class="results"><span class="base"><b class="phrase">smile on <i class="obj">sth/sb</i></b></span></span>
+ </a>
+ </li>
+ <li>
+ <a title="smitten" class="topic_2 even " href=" https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD/smitten?topic=liking ">
+ <span class="results"><span class="base"><b class="hw">smitten</b></span></span>
+ </a>
+ </li>
+ <li>
+ <a title="soft corner" class="topic_2 odd " href=" https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD/soft-corner?topic=liking ">
+ <span class="results"><span class="base"><b class="hw">soft corner</b></span></span>
+ </a>
+ </li>
+ <li>
+ <a title="soft spot" class="topic_2 even " href=" https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD/soft-spot?topic=liking ">
+ <span class="results"><span class="base"><b class="hw">soft spot</b></span></span>
+ </a>
+ </li>
+ <li>
+ <a title="take a shine to sb idiom" class="topic_2 odd " href=" https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD/take-a-shine-to-sb?topic=liking ">
+ <span class="results"><span class="base"><b class="phrase">take a shine to <i title="sb: abbreviation for somebody." class="obj">sb</i></b></span> <span class="pos">idiom</span> </span>
+ </a>
+ </li>
+ <li>
+ <a title="taste" class="topic_3 even " href=" https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD/taste?topic=liking ">
+ <span class="results"><span class="base"><b class="hw">taste</b></span></span>
+ </a>
+ </li>
+ <li>
+ <a title="thing" class="topic_3 odd " href=" https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD/thing?topic=liking ">
+ <span class="results"><span class="base"><b class="hw">thing</b></span></span>
+ </a>
+ </li>
+ <li>
+ <a title="warm" class="topic_3 even " href=" https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD/warm?topic=liking ">
+ <span class="results"><span class="base"><b class="hw">warm</b></span></span>
+ </a>
+ </li>
+ </ul>
+ </div>
+ <p><a href="https://dictionary.cambridge.org/zhs/topics/liking-and-attractiveness/liking/" title="在Liking话题中love的同义词和相关词"><b>查看更多结果»</b></a></p>
+ </div>
- <div class="sense-block" id="british-1-1-2">
+ <div>
+ <p class="semi-flush">你还可以在这些话题中找到相关的词、词组和同义词：</p>
+ <div><a href="https://dictionary.cambridge.org/zhs/topics/wanting/wanting-things/" class="cdo-topic cdo-link" title="在Wanting things话题中love的同义词和相关词">Wanting things</a></div>
+ </div>
+ </div>
+ </div>
+ </div><div class="cols__col"><div class="xref grammar"><h3 class="h4 txt-block txt-block--alt"><strong class="xref-title">Grammar</strong></h3>
- <h3 class="txt-block txt-block--alt2"><span class="hw">love</span> <span class="pos" title="A word that describes an action, condition or experience.">verb</span> <span class="gram"><a href="https://dictionary.cambridge.org/help/codes.html">[<span class="gcs"> <span title="Transitive verb: a verb that has an object." class="gc">T</span> </span>]</a></span> <span class="guideword" title="Guide word: helps you find the right meaning when a word has more than one meaning">
- (<span>LIKE SOMETHING</span>)
- </span></h3>
- <div class="sense-body">
- <div class="def-block pad-indent" data-wl-senseid="ID_00019069_02"><p class="def-head semi-flush"><span class="def-info"><span class="epp-xref A1" title="A1: Beginner level. English Vocabulary Profile symbols A1-C2 show which words and phrases learners know at each level.">A1</span> </span><b class="def">to like something very much: </b></p><span class="def-body"><div class="examp emphasized"><span title="Example" class="eg">She loves <a class="query" href="https://dictionary.cambridge.org/dictionary/english/animal" title="animals">animals</a>.</span></div><div class="examp emphasized"> <span title="Example" class="eg">I <a class="query" href="https://dictionary.cambridge.org/dictionary/english/absolutely" title="absolutely">absolutely</a> love <a class="query" href="https://dictionary.cambridge.org/dictionary/english/chocolate" title="chocolate">chocolate</a>.</span></div><div class="examp emphasized"> <span title="Example" class="eg">He really loves his <a class="query" href="https://dictionary.cambridge.org/dictionary/english/job" title="job">job</a>.</span></div><div class="examp emphasized"> <span class="gram"><a href="https://dictionary.cambridge.org/help/codes.html">[<span class="gcs"> <span title="Followed by the 'ing' form of a verb." class="gc">+ -ing verb</span> </span>]</a></span> <span title="Example" class="eg">I love <a class="query" href="https://dictionary.cambridge.org/dictionary/english/ski" title="ski">ski</a><span class="b">ing</span>.</span></div><div class="examp emphasized"> <span title="Example" class="eg">Love it or <a class="query" href="https://dictionary.cambridge.org/dictionary/english/hate" title="hate">hate</a> it, <a class="query" href="https://dictionary.cambridge.org/dictionary/english/reality" title="reality">reality</a> TV is here to <a class="query" href="https://dictionary.cambridge.org/dictionary/english/stay" title="stay">stay</a>.</span></div></span></div>
- <div class="phrase-block pad-indent"><span class="phrase-head"><span title="Phrase" class="phrase-title"><span class="phrase">would love</span></span></span><div class="phrase-body pad-indent">
- <div class="def-block pad-indent" data-wl-senseid="ID_00019069_03"><p class="def-head semi-flush"><span class="def-info"><span title="A2: Elementary level. English Vocabulary Profile symbols A1-C2 show which words and phrases learners know at each level." class="epp-xref A2">A2</span> </span><b class="def">used, often in <a class="query" href="https://dictionary.cambridge.org/dictionary/english/request" title="requests">requests</a>, to say that you would very much like something: </b></p><span class="def-body"><div class="examp emphasized"><span title="Example" class="eg">I'd love a <a class="query" href="https://dictionary.cambridge.org/dictionary/english/cup" title="cup">cup</a> of <a class="query" href="https://dictionary.cambridge.org/dictionary/english/coffee" title="coffee">coffee</a> if you're making one.</span></div><div class="examp emphasized"> <span class="gram"><a href="https://dictionary.cambridge.org/help/codes.html">[<span class="gcs"> <span title="Followed by 'to' and a verb in the infinitive." class="gc">+ to infinitive</span> </span>]</a></span> <span title="Example" class="eg">She would <a class="query" href="https://dictionary.cambridge.org/dictionary/english/dearly" title="dearly">dearly</a> love <span class="b">to</span> <a class="query" href="https://dictionary.cambridge.org/dictionary/english/start" title="start">start</a> her own <a class="query" href="https://dictionary.cambridge.org/dictionary/english/business" title="business">business</a>.</span></div><div class="examp emphasized"><span title="British English" class="lab"><span title="British English" class="region">UK</span></span> <span title="Example" class="eg">I'd love you <span class="b">to</span> come to <a class="query" href="https://dictionary.cambridge.org/dictionary/english/dinner" title="dinner">dinner</a> next <a class="query" href="https://dictionary.cambridge.org/dictionary/english/week" title="week">week</a>.</span></div><div class="examp emphasized"><span title="American English" class="lab"><span title="American English" class="region">US</span></span> <span title="Example" class="eg">I'd love <span class="b">for</span> you <span class="b">to</span> come to <a class="query" href="https://dictionary.cambridge.org/dictionary/english/dinner" title="dinner">dinner</a> next <a class="query" href="https://dictionary.cambridge.org/dictionary/english/week" title="week">week</a>.</span></div></span></div>
- </div></div>
- <div class="extraexamps"><p class="accord-basic js-accord accord-basic--shallow">More examples</p><ul class="unstyled emphasized pad-indent"><li class="eg">We would <a class="query" href="https://dictionary.cambridge.org/dictionary/english/dearly" title="dearly">dearly</a> love to <a class="query" href="https://dictionary.cambridge.org/dictionary/english/sell" title="sell">sell</a> <a class="query" href="https://dictionary.cambridge.org/dictionary/english/our" title="our">our</a> <a class="query" href="https://dictionary.cambridge.org/dictionary/english/flat" title="flat">flat</a> and <a class="query" href="https://dictionary.cambridge.org/dictionary/english/move" title="move">move</a> to the <a class="query" href="https://dictionary.cambridge.org/dictionary/english/country" title="country">country</a>.</li><li class="eg">The <a class="query" href="https://dictionary.cambridge.org/dictionary/english/kid" title="kids">kids</a> love <a class="query" href="https://dictionary.cambridge.org/dictionary/english/feeding" title="feeding">feeding</a> <a class="query" href="https://dictionary.cambridge.org/dictionary/english/bread" title="bread">bread</a> to the <a class="query" href="https://dictionary.cambridge.org/dictionary/english/duck" title="ducks">ducks</a>.</li><li class="eg">I love Fridays because I <a class="query" href="https://dictionary.cambridge.org/dictionary/english/leave" title="leave">leave</a> <a class="query" href="https://dictionary.cambridge.org/dictionary/english/work" title="work">work</a> early.</li><li class="eg">I've never been <a class="query" href="https://dictionary.cambridge.org/dictionary/english/keen" title="keen">keen</a> on <a class="query" href="https://dictionary.cambridge.org/dictionary/english/classical" title="classical">classical</a> <a class="query" href="https://dictionary.cambridge.org/dictionary/english/music" title="music">music</a>, but I love <a class="query" href="https://dictionary.cambridge.org/dictionary/english/jazz" title="jazz">jazz</a>.</li><li class="eg">I'd love to go to <a class="query" href="https://dictionary.cambridge.org/dictionary/english/australia" title="Australia">Australia</a>. I only <a class="query" href="https://dictionary.cambridge.org/dictionary/english/wish" title="wish">wish</a> I could <a class="query" href="https://dictionary.cambridge.org/dictionary/english/afford" title="afford">afford</a> to.</li></ul></div>
- </div>
+ <div class="item"><a href="https://dictionary.cambridge.org/zhs/%E8%AF%AD%E6%B3%95/%E8%8B%B1%E5%BC%8F%E8%AF%AD%E6%B3%95/hate-like-love-and-prefer" title="关于Hate, like, love and prefer的语法"><span class="x-h"><i class="obj">Hate</i>, <i class="obj">like</i>, <i class="obj">love</i> and <i class="obj">prefer</i></span><span class="x-pos">We can use hate, like, love and prefer with an -ing form or with a to-infinitive:</span> …
+ </a></div></div></div><div class="cols cols--half"><div class="cols__col"><div class="xref idioms"><h3 class="h4 txt-block txt-block--alt"><strong class="xref-title">
+ 习惯用语 </strong></h3>
- <div class="smartt">
- <p class="accord-basic js-accord accord-basic--shallow">Thesaurus: synonyms and related words</p>
- <div>
- <p>
- <a href="https://dictionary.cambridge.org/topics/liking-and-attractiveness/liking/" class="cdo-topic cdo-link" title="Synonyms and related words for love in the Liking topic">Liking</a>
- </p>
- <div class="txt-block cloud rounded">
- <div class="cdo-cloud-content">
- <ul class="unstyled inline">
- <li>
- <a title="affection" class="topic_0 odd " href=" https://dictionary.cambridge.org/dictionary/british/affection?topic=liking ">
- <span class="results"><span class="base"><b class="hw">affection</b></span></span>
- </a>
- </li>
- <li>
- <a title="attached" class="topic_0 even " href=" https://dictionary.cambridge.org/dictionary/british/attached?topic=liking ">
- <span class="results"><span class="base"><b class="hw">attached</b></span></span>
- </a>
- </li>
- <li>
- <a title="be a glutton for sth idiom" class="topic_0 odd " href=" https://dictionary.cambridge.org/dictionary/british/be-a-glutton-for-sth?topic=liking ">
- <span class="results"><span class="base"><b class="phrase">be a glutton for <i title="sth: abbreviation for something." class="obj">sth</i></b></span> <span class="pos">idiom</span> </span>
- </a>
- </li>
- <li>
- <a title="be a hit with sb idiom" class="topic_0 even " href=" https://dictionary.cambridge.org/dictionary/british/be-a-hit-with-sb?topic=liking ">
- <span class="results"><span class="base"><b class="phrase">be a hit with <i class="obj" title="sb: abbreviation for somebody.">sb</i></b></span> <span class="pos">idiom</span> </span>
- </a>
- </li>
- <li>
- <a title="be big on sth idiom" class="topic_0 odd " href=" https://dictionary.cambridge.org/dictionary/british/be-big-on-sth?topic=liking ">
- <span class="results"><span class="base"><b class="phrase">be big on <i title="sth: abbreviation for something." class="obj">sth</i></b></span> <span class="pos">idiom</span> </span>
- </a>
- </li>
- <li>
- <a title="grow" class="topic_3 even " href=" https://dictionary.cambridge.org/dictionary/british/grow?topic=liking ">
- <span class="results"><span class="base"><b class="hw">grow</b></span></span>
- </a>
- </li>
- <li>
- <a title="grow on sb" class="topic_1 odd " href=" https://dictionary.cambridge.org/dictionary/british/grow-on-sb?topic=liking ">
- <span class="results"><span class="base"><b class="phrase">grow on <i title="sb: abbreviation for somebody." class="obj">sb</i></b></span></span>
- </a>
- </li>
- <li>
- <a title="have a lot of time for sb idiom" class="topic_1 even " href=" https://dictionary.cambridge.org/dictionary/british/have-a-lot-of-time-for-sb?topic=liking ">
- <span class="results"><span class="base"><b class="phrase">have a lot of time for <i class="obj" title="sb: abbreviation for somebody.">sb</i></b></span> <span class="pos">idiom</span> </span>
- </a>
- </li>
- <li>
- <a title="have a thing about sth/sb idiom" class="topic_1 odd " href=" https://dictionary.cambridge.org/dictionary/british/have-a-thing-about-sth-sb?topic=liking ">
- <span class="results"><span class="base"><b class="phrase">have a thing about <i class="obj">sth/sb</i></b></span> <span class="pos">idiom</span> </span>
- </a>
- </li>
- <li>
- <a title="lick your lips idiom" class="topic_1 even " href=" https://dictionary.cambridge.org/dictionary/british/lick-your-lips?topic=liking ">
- <span class="results"><span class="base"><b class="phrase">lick <i class="obj" title="You can use my, your, their, etc. here">your</i> lips</b></span> <span class="pos">idiom</span> </span>
- </a>
- </li>
- <li>
- <a title="liking" class="topic_1 odd " href=" https://dictionary.cambridge.org/dictionary/british/liking?topic=liking ">
- <span class="results"><span class="base"><b class="hw">liking</b></span></span>
- </a>
- </li>
- <li>
- <a title="smile on sth/sb" class="topic_2 even " href=" https://dictionary.cambridge.org/dictionary/british/smile-on-sth-sb?topic=liking ">
- <span class="results"><span class="base"><b class="phrase">smile on <i class="obj">sth/sb</i></b></span></span>
- </a>
- </li>
- <li>
- <a title="smitten" class="topic_2 odd " href=" https://dictionary.cambridge.org/dictionary/british/smitten?topic=liking ">
- <span class="results"><span class="base"><b class="hw">smitten</b></span></span>
- </a>
- </li>
- <li>
- <a title="soft corner" class="topic_2 even " href=" https://dictionary.cambridge.org/dictionary/british/soft-corner?topic=liking ">
- <span class="results"><span class="base"><b class="hw">soft corner</b></span></span>
- </a>
- </li>
- <li>
- <a title="soft spot" class="topic_2 odd " href=" https://dictionary.cambridge.org/dictionary/british/soft-spot?topic=liking ">
- <span class="results"><span class="base"><b class="hw">soft spot</b></span></span>
- </a>
- </li>
- <li>
- <a title="take a shine to sb idiom" class="topic_2 even " href=" https://dictionary.cambridge.org/dictionary/british/take-a-shine-to-sb?topic=liking ">
- <span class="results"><span class="base"><b class="phrase">take a shine to <i title="sb: abbreviation for somebody." class="obj">sb</i></b></span> <span class="pos">idiom</span> </span>
- </a>
- </li>
- <li>
- <a title="taste" class="topic_3 odd " href=" https://dictionary.cambridge.org/dictionary/british/taste?topic=liking ">
- <span class="results"><span class="base"><b class="hw">taste</b></span></span>
- </a>
- </li>
- <li>
- <a title="thing" class="topic_3 even " href=" https://dictionary.cambridge.org/dictionary/british/thing?topic=liking ">
- <span class="results"><span class="base"><b class="hw">thing</b></span></span>
- </a>
- </li>
- <li>
- <a title="tight" class="topic_3 odd " href=" https://dictionary.cambridge.org/dictionary/british/tight?topic=liking ">
- <span class="results"><span class="base"><b class="hw">tight</b></span></span>
- </a>
- </li>
- <li>
- <a title="warm" class="topic_3 even " href=" https://dictionary.cambridge.org/dictionary/british/warm?topic=liking ">
- <span class="results"><span class="base"><b class="hw">warm</b></span></span>
- </a>
- </li>
- </ul>
- </div>
- <p><a href="https://dictionary.cambridge.org/topics/liking-and-attractiveness/liking/" title="Synonyms and related words for love in the Liking topic"><b>See more results »</b></a></p>
- </div>
-
- <div>
- <p class="semi-flush">You can also find related words, phrases, and synonyms in the topics:</p>
- <div><a href="https://dictionary.cambridge.org/topics/wanting/wanting-things/" class="cdo-topic cdo-link" title="Synonyms and related words for love in the Wanting things topic">Wanting things</a></div>
- </div>
- </div>
- </div>
- </div><div class="cols__col"><div class="xref grammar">
- <h3 class="h4 txt-block txt-block--alt"><strong class="xref-title">Grammar</strong></h3>
+ <div class="item"><a href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD/love-sb-to-bits" title="love sb to bits的意思"><span class="x-h"><b class="phrase">love <i class="obj">sb</i> to bits</b></span></a></div>
-
- <div class="item"><a href="https://dictionary.cambridge.org/grammar/british-grammar/hate-like-love-and-prefer" title="grammar for Hate, like, love and prefer"><span class="x-h"><span class="obj">Hate</span>, <span class="obj">like</span>, <span class="obj">love</span> and <span class="obj">prefer</span></span><span class="x-pos">We can use hate, like, love and prefer with an -ing form or with a to-infinitive:</span> …
- </a></div></div></div><div class="cols cols--half"><div class="cols__col"><div class="xref idioms">
- <h3 class="h4 txt-block txt-block--alt"><strong class="xref-title">
- Idiom(s) </strong></h3>
-
-
- <div class="item"><a href="https://dictionary.cambridge.org/dictionary/english/love-sb-to-bits" title="meaning of love sb to bits"><span class="x-h"><span class="phrase">love <span title="sb: abbreviation for somebody." class="obj">sb</span> to bits</span></span></a></div>
-
- <div class="item"><a href="https://dictionary.cambridge.org/dictionary/english/love-me-love-my-dog" title="meaning of love me, love my dog"><span class="x-h"><span class="phrase">love me, love my dog</span></span></a></div></div></div></div></div></div> <div class="entry-body__el clrd js-share-holder"><div class="pos-header">
- <div class="h3 di-title cdo-section-title-hw"><span class="headword"><span class="hw">love</span></span>
+ <div class="item"><a href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD/love-me-love-my-dog" title="love me, love my dog的意思"><span class="x-h"><b class="phrase">love me, love my dog</b></span></a></div></div></div></div></div></div> <div class="entry-body__el clrd js-share-holder"><div class="pos-header"><div class="h3 di-title cdo-section-title-hw"><span class="headword"><span class="hw">love</span></span>
<span class="posgram ico-bg"><span class="pos" title="A word that refers to a person, place, idea, event or thing.">noun</span></span>
</div>
- <span class="pron-info"><span class="uk"><span class="region">uk</span>
- <span title="love: listen to British English pronunciation" data-src-mp3="https://dictionary.cambridge.org/media/english/uk_pron/u/ukl/uklou/ukloudn014.mp3" data-src-ogg="https://dictionary.cambridge.org/media/english/uk_pron_ogg/u/ukl/uklou/ukloudn014.ogg" class="circle circle-btn sound audio_play_button uk">
+ <span class="uk"><span class="region">uk</span>
+ <span title="love: listen to British English pronunciation" data-src-mp3="/zhs/media/%E8%8B%B1%E8%AF%AD/uk_pron/u/ukl/uklou/ukloudn014.mp3" data-src-ogg="/zhs/media/%E8%8B%B1%E8%AF%AD/uk_pron_ogg/u/ukl/uklou/ukloudn014.ogg" class="circle circle-btn sound audio_play_button">
<i class='fcdo fcdo-volume-up'>​</i>
</span>
- </span>
- <span class="uk"><span class="pron">/<span class="ipa">lʌv</span>/</span></span>
- </span><span class="pron-info"><span class="us"><span class="region">us</span>
- <span title="love: listen to American pronunciation" data-src-mp3="https://dictionary.cambridge.org/media/english/us_pron/l/lov/love_/love.mp3" data-src-ogg="https://dictionary.cambridge.org/media/english/us_pron_ogg/l/lov/love_/love.ogg" class="circle circle-btn sound audio_play_button us">
+ <span class="pron">/<span class="ipa">lʌv</span>/</span> </span><span class="us"><span class="region">us</span>
+ <span title="love: listen to American pronunciation" data-src-mp3="/zhs/media/%E8%8B%B1%E8%AF%AD/us_pron/l/lov/love_/love.mp3" data-src-ogg="/zhs/media/%E8%8B%B1%E8%AF%AD/us_pron_ogg/l/lov/love_/love.ogg" class="circle circle-btn sound audio_play_button">
<i class='fcdo fcdo-volume-up'>​</i>
</span>
- </span>
- <span class="uk"><span class="pron">/<span class="ipa">lʌv</span>/</span></span>
- </span>
+ <span class="pron">/<span class="ipa">lʌv</span>/</span> </span>
<div class="share rounded js-share">
<span class="point"></span>
- <a class="circle bg--fb socialShareLink" title="Share this entry on Facebook" href='https://www.facebook.com/sharer.php?u=https%3A%2F%2Fdictionary.cambridge.org%2Fdictionary%2Fenglish%2Flove&t=love+Meaning+in+the+Cambridge+English+Dictionary' target='_blank' data-social='facebook' data-url='https://www.facebook.com/sharer.php?u=https%3A%2F%2Fdictionary.cambridge.org%2Fdictionary%2Fenglish%2Flove&t=love+Meaning+in+the+Cambridge+English+Dictionary' data-object='entry'>
+ <a class="circle bg--fb socialShareLink" title="在Facebook上分享该词条" href='https://www.facebook.com/sharer.php?u=https%3A%2F%2Fdictionary.cambridge.org%2Fzhs%2F%25E8%25AF%258D%25E5%2585%25B8%2F%25E8%258B%25B1%25E8%25AF%25AD%2Flove&t=LOVE%E5%9C%A8%E5%89%91%E6%A1%A5%E8%8B%B1%E8%AF%AD%E8%AF%8D%E5%85%B8%E4%B8%AD%E7%9A%84%E8%A7%A3%E9%87%8A%E5%8F%8A%E7%BF%BB%E8%AF%91' target='_blank' data-social='facebook' data-url='https://www.facebook.com/sharer.php?u=https%3A%2F%2Fdictionary.cambridge.org%2Fzhs%2F%25E8%25AF%258D%25E5%2585%25B8%2F%25E8%258B%25B1%25E8%25AF%25AD%2Flove&t=LOVE%E5%9C%A8%E5%89%91%E6%A1%A5%E8%8B%B1%E8%AF%AD%E8%AF%8D%E5%85%B8%E4%B8%AD%E7%9A%84%E8%A7%A3%E9%87%8A%E5%8F%8A%E7%BF%BB%E8%AF%91' data-object='entry'>
<i class="fcdo fcdo-facebook" aria-hidden="true"></i>
</a>
- <a class="circle bg--tw socialShareLink" title="Tweet this entry" href='https://twitter.com/intent/tweet?url=https%3A%2F%2Fdictionary.cambridge.org%2Fdictionary%2Fenglish%2Flove&text=love+Meaning+in+the+Cambridge+English+Dictionary' target='_blank' data-social='twitter' data-url='https://twitter.com/intent/tweet?url=https%3A%2F%2Fdictionary.cambridge.org%2Fdictionary%2Fenglish%2Flove&text=love+Meaning+in+the+Cambridge+English+Dictionary' data-object='entry'>
+ <a class="circle bg--tw socialShareLink" title="用推特发送该页面" href='https://twitter.com/intent/tweet?url=https%3A%2F%2Fdictionary.cambridge.org%2Fzhs%2F%25E8%25AF%258D%25E5%2585%25B8%2F%25E8%258B%25B1%25E8%25AF%25AD%2Flove&text=LOVE%E5%9C%A8%E5%89%91%E6%A1%A5%E8%8B%B1%E8%AF%AD%E8%AF%8D%E5%85%B8%E4%B8%AD%E7%9A%84%E8%A7%A3%E9%87%8A%E5%8F%8A%E7%BF%BB%E8%AF%91' target='_blank' data-social='twitter' data-url='https://twitter.com/intent/tweet?url=https%3A%2F%2Fdictionary.cambridge.org%2Fzhs%2F%25E8%25AF%258D%25E5%2585%25B8%2F%25E8%258B%25B1%25E8%25AF%25AD%2Flove&text=LOVE%E5%9C%A8%E5%89%91%E6%A1%A5%E8%8B%B1%E8%AF%AD%E8%AF%8D%E5%85%B8%E4%B8%AD%E7%9A%84%E8%A7%A3%E9%87%8A%E5%8F%8A%E7%BF%BB%E8%AF%91' data-object='entry'>
<i class="fcdo fcdo-twitter" aria-hidden="true"></i>
</a>
- <a class="circle bg--more js-accord" title="More" href="#" >
+ <a class="circle bg--more js-accord" title="更多" href="#" >
<i class="fcdo fcdo-plus"></i>
<i class="fcdo fcdo-minus"></i>
</a>
<div class="oflow-hide js-share-toggle">
- <a class="circle bg--gp socialShareLink" title="Share this entry on Google+" href='https://plus.google.com/share?url=https%3A%2F%2Fdictionary.cambridge.org%2Fdictionary%2Fenglish%2Flove' target='_blank' data-social='google' data-url='https://plus.google.com/share?url=https%3A%2F%2Fdictionary.cambridge.org%2Fdictionary%2Fenglish%2Flove' data-object='entry'>
+ <a class="circle bg--gp socialShareLink" title="在Google+上分享该词条" href='https://plus.google.com/share?url=https%3A%2F%2Fdictionary.cambridge.org%2Fzhs%2F%25E8%25AF%258D%25E5%2585%25B8%2F%25E8%258B%25B1%25E8%25AF%25AD%2Flove' target='_blank' data-social='google' data-url='https://plus.google.com/share?url=https%3A%2F%2Fdictionary.cambridge.org%2Fzhs%2F%25E8%25AF%258D%25E5%2585%25B8%2F%25E8%258B%25B1%25E8%25AF%25AD%2Flove' data-object='entry'>
<i class="fcdo fcdo-google-plus" aria-hidden="true"></i>
</a>
- <a class="circle bg--di socialShareLink" title="Share this entry on Diigo" href='https://www.diigo.com/post?url=https%3A%2F%2Fdictionary.cambridge.org%2Fdictionary%2Fenglish%2Flove&title=love+Meaning+in+the+Cambridge+English+Dictionary' target='_blank' data-social='diigo' data-url='https://www.diigo.com/post?url=https%3A%2F%2Fdictionary.cambridge.org%2Fdictionary%2Fenglish%2Flove&title=love+Meaning+in+the+Cambridge+English+Dictionary' data-object='entry'>
+ <a class="circle bg--di socialShareLink" title="在Diigo上分享该词条" href='https://www.diigo.com/post?url=https%3A%2F%2Fdictionary.cambridge.org%2Fzhs%2F%25E8%25AF%258D%25E5%2585%25B8%2F%25E8%258B%25B1%25E8%25AF%25AD%2Flove&title=LOVE%E5%9C%A8%E5%89%91%E6%A1%A5%E8%8B%B1%E8%AF%AD%E8%AF%8D%E5%85%B8%E4%B8%AD%E7%9A%84%E8%A7%A3%E9%87%8A%E5%8F%8A%E7%BF%BB%E8%AF%91' target='_blank' data-social='diigo' data-url='https://www.diigo.com/post?url=https%3A%2F%2Fdictionary.cambridge.org%2Fzhs%2F%25E8%25AF%258D%25E5%2585%25B8%2F%25E8%258B%25B1%25E8%25AF%25AD%2Flove&title=LOVE%E5%9C%A8%E5%89%91%E6%A1%A5%E8%8B%B1%E8%AF%AD%E8%AF%8D%E5%85%B8%E4%B8%AD%E7%9A%84%E8%A7%A3%E9%87%8A%E5%8F%8A%E7%BF%BB%E8%AF%91' data-object='entry'>
<i class="fcdo fcdo-diigo" aria-hidden="true"></i>
</a>
- <a class="circle bg--su socialShareLink" title="Share this entry on StumbleUpon" href='https://www.stumbleupon.com/likecontent?url=https%3A%2F%2Fdictionary.cambridge.org%2Fdictionary%2Fenglish%2Flove&title=love+Meaning+in+the+Cambridge+English+Dictionary' target='_blank' data-social='stumbleupon' data-url='https://www.stumbleupon.com/likecontent?url=https%3A%2F%2Fdictionary.cambridge.org%2Fdictionary%2Fenglish%2Flove&title=love+Meaning+in+the+Cambridge+English+Dictionary' data-object='entry'>
- <i class="fcdo fcdo-stumbleupon" aria-hidden="true"></i>
- </a>
- <a class="circle bg--tu socialShareLink" title="Share this entry on Tumblr" href='https://www.tumblr.com/share/link?url=https%3A%2F%2Fdictionary.cambridge.org%2Fdictionary%2Fenglish%2Flove&name=love+Meaning+in+the+Cambridge+English+Dictionary' target='_blank' data-social='tumblr' data-url='https://www.tumblr.com/share/link?url=https%3A%2F%2Fdictionary.cambridge.org%2Fdictionary%2Fenglish%2Flove&name=love+Meaning+in+the+Cambridge+English+Dictionary' data-object='entry'>
+ <a class="circle bg--tu socialShareLink" title="在Tumblr上分享该词条" href='https://www.tumblr.com/share/link?url=https%3A%2F%2Fdictionary.cambridge.org%2Fzhs%2F%25E8%25AF%258D%25E5%2585%25B8%2F%25E8%258B%25B1%25E8%25AF%25AD%2Flove&name=LOVE%E5%9C%A8%E5%89%91%E6%A1%A5%E8%8B%B1%E8%AF%AD%E8%AF%8D%E5%85%B8%E4%B8%AD%E7%9A%84%E8%A7%A3%E9%87%8A%E5%8F%8A%E7%BF%BB%E8%AF%91' target='_blank' data-social='tumblr' data-url='https://www.tumblr.com/share/link?url=https%3A%2F%2Fdictionary.cambridge.org%2Fzhs%2F%25E8%25AF%258D%25E5%2585%25B8%2F%25E8%258B%25B1%25E8%25AF%25AD%2Flove&name=LOVE%E5%9C%A8%E5%89%91%E6%A1%A5%E8%8B%B1%E8%AF%AD%E8%AF%8D%E5%85%B8%E4%B8%AD%E7%9A%84%E8%A7%A3%E9%87%8A%E5%8F%8A%E7%BF%BB%E8%AF%91' data-object='entry'>
<i class="fcdo fcdo-tumblr" aria-hidden="true"></i>
</a>
- <a class="circle bg--re socialShareLink" title="Share this entry on Reddit" href='https://www.reddit.com/submit?url=https%3A%2F%2Fdictionary.cambridge.org%2Fdictionary%2Fenglish%2Flove&title=love+Meaning+in+the+Cambridge+English+Dictionary' target='_blank' data-social='reddit' data-url='https://www.reddit.com/submit?url=https%3A%2F%2Fdictionary.cambridge.org%2Fdictionary%2Fenglish%2Flove&title=love+Meaning+in+the+Cambridge+English+Dictionary' data-object='entry'>
+ <a class="circle bg--re socialShareLink" title="在Reddit上分享该词条" href='https://www.reddit.com/submit?url=https%3A%2F%2Fdictionary.cambridge.org%2Fzhs%2F%25E8%25AF%258D%25E5%2585%25B8%2F%25E8%258B%25B1%25E8%25AF%25AD%2Flove&title=LOVE%E5%9C%A8%E5%89%91%E6%A1%A5%E8%8B%B1%E8%AF%AD%E8%AF%8D%E5%85%B8%E4%B8%AD%E7%9A%84%E8%A7%A3%E9%87%8A%E5%8F%8A%E7%BF%BB%E8%AF%91' target='_blank' data-social='reddit' data-url='https://www.reddit.com/submit?url=https%3A%2F%2Fdictionary.cambridge.org%2Fzhs%2F%25E8%25AF%258D%25E5%2585%25B8%2F%25E8%258B%25B1%25E8%25AF%25AD%2Flove&title=LOVE%E5%9C%A8%E5%89%91%E6%A1%A5%E8%8B%B1%E8%AF%AD%E8%AF%8D%E5%85%B8%E4%B8%AD%E7%9A%84%E8%A7%A3%E9%87%8A%E5%8F%8A%E7%BF%BB%E8%AF%91' data-object='entry'>
<i class="fcdo fcdo-reddit-alien" aria-hidden="true"></i>
</a>
- <a class="circle bg--def socialShareLink" title="Share this url" dsp-txt='https://dictionary.cambridge.org/dictionary/english/love' data-social='url' data-url='https://dictionary.cambridge.org/dictionary/english/love' data-object='entry'>
+ <a class="circle bg--def socialShareLink" title="分享这个链接" dsp-txt='https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD/love' data-social='url' data-url='https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD/love' data-object='entry'>
<i class="fcdo fcdo-link" aria-hidden="true"></i>
</a>
</div>
</div>
</div><div class="pos-body">
- <div class="sense-block" id="british-1-2-1">
-
- <h3 class="txt-block txt-block--alt2"><span class="hw">love</span> <span class="pos" title="A word that refers to a person, place, idea, event or thing.">noun</span> <span class="guideword" title="Guide word: helps you find the right meaning when a word has more than one meaning">
+ <div class="sense-block" id="cald4-1-2-1"> <h3 class="txt-block txt-block--alt2"><span class="hw">love</span> <span class="pos" title="A word that refers to a person, place, idea, event or thing.">noun</span> <span class="guideword" title="Guide word: helps you find the right meaning when a word has more than one meaning">
(<span>LIKING SOMEONE</span>)
- </span></h3>
- <div class="sense-body">
- <div class="def-block pad-indent" data-wl-senseid="ID_00019069_06"><p class="def-head semi-flush"><span class="def-info"><span title="B1: Intermediate level. English Vocabulary Profile symbols A1-C2 show which words and phrases learners know at each level." class="epp-xref B1">B1</span> <span class="gram"><a href="https://dictionary.cambridge.org/help/codes.html">[<span class="gcs"> <span title="Uncountable noun: noun with no plural form. Cannot be used with 'a', 'an', or 'one'." class="gc">U</span> </span>]</a></span></span> <b class="def">the <a class="query" href="https://dictionary.cambridge.org/dictionary/english/feeling" title="feeling">feeling</a> of <a class="query" href="https://dictionary.cambridge.org/dictionary/english/liking" title="liking">liking</a> another <a class="query" href="https://dictionary.cambridge.org/dictionary/english/adult" title="adult">adult</a> very much and being <a class="query" href="https://dictionary.cambridge.org/dictionary/english/romantic" title="romantically">romantically</a> and <a class="query" href="https://dictionary.cambridge.org/dictionary/english/sexually" title="sexually">sexually</a> <a class="query" href="https://dictionary.cambridge.org/dictionary/english/attract" title="attracted">attracted</a> to them, or <a class="query" href="https://dictionary.cambridge.org/dictionary/english/strong" title="strong">strong</a> <a class="query" href="https://dictionary.cambridge.org/dictionary/english/feeling" title="feelings">feelings</a> of <a class="query" href="https://dictionary.cambridge.org/dictionary/english/liking" title="liking">liking</a> a <a class="query" href="https://dictionary.cambridge.org/dictionary/english/friend" title="friend">friend</a> or <a class="query" href="https://dictionary.cambridge.org/dictionary/english/person" title="person">person</a> in <a class="query" href="https://dictionary.cambridge.org/dictionary/english/your" title="your">your</a> <a class="query" href="https://dictionary.cambridge.org/dictionary/english/family" title="family">family</a>: </b></p><span class="def-body"><div class="examp emphasized"><span title="Example" class="eg">"I've been <a class="query" href="https://dictionary.cambridge.org/dictionary/english/see" title="seeing">seeing</a> him over a <a class="query" href="https://dictionary.cambridge.org/dictionary/english/year" title="year">year</a> now." "Is it love?"</span></div><div class="examp emphasized"> <span title="Example" class="eg">Children need to be <a class="query" href="https://dictionary.cambridge.org/dictionary/english/shown" title="shown">shown</a> <a class="query" href="https://dictionary.cambridge.org/dictionary/english/lot" title="lots">lots</a> of love.</span></div><div class="examp emphasized"> <span title="Example" class="eg">"I'm <a class="query" href="https://dictionary.cambridge.org/dictionary/english/see" title="seeing">seeing</a> Laura next <a class="query" href="https://dictionary.cambridge.org/dictionary/english/week" title="week">week</a>." "Oh, <a class="query" href="https://dictionary.cambridge.org/dictionary/english/please" title="please">please</a> <span class="b">give</span> her my love" <span class="gloss">(= <a class="query" href="https://dictionary.cambridge.org/dictionary/english/tell" title="tell">tell</a> her I am <a class="query" href="https://dictionary.cambridge.org/dictionary/english/thinking" title="thinking">thinking</a> about her with <a class="query" href="https://dictionary.cambridge.org/dictionary/english/affection" title="affection">affection</a>)</span>.</span></div><div class="examp emphasized"> <span title="Example" class="eg">Maggie <a class="query" href="https://dictionary.cambridge.org/dictionary/english/ask" title="asked">asked</a> me to <span class="b"><a class="query" href="https://dictionary.cambridge.org/dictionary/english/send" title="send">send</a></span> her love to you and the <a class="query" href="https://dictionary.cambridge.org/dictionary/english/kid" title="kids">kids</a> <span class="gloss">(= <a class="query" href="https://dictionary.cambridge.org/dictionary/english/tell" title="tell">tell</a> you that she is <a class="query" href="https://dictionary.cambridge.org/dictionary/english/thinking" title="thinking">thinking</a> about you with <a class="query" href="https://dictionary.cambridge.org/dictionary/english/affection" title="affection">affection</a>)</span>.</span></div><div class="examp emphasized"><span title="Used in relaxed situations, for example with friends and family. Used more in speech." class="lab"><span title="Used in relaxed situations, for example with friends and family. Used more in speech." class="usage">informal</span></span> <span title="Example" class="eg">How's <a class="query" href="https://dictionary.cambridge.org/dictionary/english/your" title="your">your</a> love <span class="b"><a class="query" href="https://dictionary.cambridge.org/dictionary/english/life" title="life">life</a></span> <span class="gloss">(= <a class="query" href="https://dictionary.cambridge.org/dictionary/english/your" title="your">your</a> <a class="query" href="https://dictionary.cambridge.org/dictionary/english/romantic" title="romantic">romantic</a> and/or <a class="query" href="https://dictionary.cambridge.org/dictionary/english/sexual" title="sexual">sexual</a> <a class="query" href="https://dictionary.cambridge.org/dictionary/english/relationship" title="relationships">relationships</a>)</span> these <a class="query" href="https://dictionary.cambridge.org/dictionary/english/day" title="days">days</a>?</span></div></span></div>
+ </span></h3> <div class="sense-body">
+ <div class="def-block pad-indent" data-wl-senseid="ID_00019069_06"><p class="def-head semi-flush"><span class="def-info"><span class="epp-xref B1">B1</span> <span class="gram"><a href="https://dictionary.cambridge.org/zhs/help/codes.html">[<span class="gcs"> <span class="gc">U</span> </span>]</a></span></span> <b class="def">the <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD/feeling" title="feeling">feeling</a> of <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD/like" title="liking">liking</a> another <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD/adult" title="adult">adult</a> very much and being <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD/romantic" title="romantically">romantically</a> and <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD/sexually" title="sexually">sexually</a> <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD/attract" title="attracted">attracted</a> to them, or <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD/strong" title="strong">strong</a> <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD/feeling" title="feelings">feelings</a> of <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD/like" title="liking">liking</a> a <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD/friend" title="friend">friend</a> or <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD/person" title="person">person</a> in <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD/your" title="your">your</a> <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD/family" title="family">family</a>: </b></p><span class="def-body"><div class="examp emphasized"><span class="eg">"I've been <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD/see" title="seeing">seeing</a> him over a <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD/year" title="year">year</a> now." "Is it love?"</span></div><div class="examp emphasized"> <span class="eg">Children need to be <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD/shown" title="shown">shown</a> <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD/lot" title="lots">lots</a> of love.</span></div><div class="examp emphasized"> <span class="eg">"I'm <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD/see" title="seeing">seeing</a> Laura next <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD/week" title="week">week</a>." "Oh, <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD/please" title="please">please</a> <b class="b">give</b> her my love" <span class="gloss">(= <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD/tell" title="tell">tell</a> her I am <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD/thinking" title="thinking">thinking</a> about her with <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD/affection" title="affection">affection</a>)</span>.</span></div><div class="examp emphasized"> <span class="eg">Maggie <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD/ask" title="asked">asked</a> me to <b class="b"><a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD/send" title="send">send</a></b> her love to you and the <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD/kid" title="kids">kids</a> <span class="gloss">(= <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD/tell" title="tell">tell</a> you that she is <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD/thinking" title="thinking">thinking</a> about you with <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD/affection" title="affection">affection</a>)</span>.</span></div><div class="examp emphasized"><span class="lab"><span class="usage">informal</span></span> <span class="eg">How's <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD/your" title="your">your</a> love <b class="b"><a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD/life" title="life">life</a></b> <span class="gloss">(= <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD/your" title="your">your</a> <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD/romantic" title="romantic">romantic</a> and/or <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD/sexual" title="sexual">sexual</a> <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD/relationship" title="relationships">relationships</a>)</span> these <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD/day" title="days">days</a>?</span></div></span></div>
- <div class="def-block pad-indent" data-wl-senseid="ID_00019069_07"><p class="def-head semi-flush"><span class="def-info"><span title="B1: Intermediate level. English Vocabulary Profile symbols A1-C2 show which words and phrases learners know at each level." class="epp-xref B1">B1</span> <span class="gram"><a href="https://dictionary.cambridge.org/help/codes.html">[<span class="gcs"> <span title="Countable noun: a noun that has both singular and plural forms." class="gc">C</span> </span>]</a></span></span> <b class="def">a <a class="query" href="https://dictionary.cambridge.org/dictionary/english/person" title="person">person</a> that you love and <a class="query" href="https://dictionary.cambridge.org/dictionary/english/feel" title="feel">feel</a> <a class="query" href="https://dictionary.cambridge.org/dictionary/english/attract" title="attracted">attracted</a> to: </b></p><span class="def-body"><div class="examp emphasized"><span title="Example" class="eg">He was the love <span class="b">of my <a class="query" href="https://dictionary.cambridge.org/dictionary/english/life" title="life">life</a></span>.</span></div><div class="examp emphasized"> <span title="Example" class="eg">She was my <span class="b">first</span> love.</span></div></span></div>
+ <div class="def-block pad-indent" data-wl-senseid="ID_00019069_07"><p class="def-head semi-flush"><span class="def-info"><span class="epp-xref B1">B1</span> <span class="gram"><a href="https://dictionary.cambridge.org/zhs/help/codes.html">[<span class="gcs"> <span class="gc">C</span> </span>]</a></span></span> <b class="def">a <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD/person" title="person">person</a> that you love and <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD/feel" title="feel">feel</a> <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD/attract" title="attracted">attracted</a> to: </b></p><span class="def-body"><div class="examp emphasized"><span class="eg">He was the love <b class="b">of my <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD/life" title="life">life</a></b>.</span></div><div class="examp emphasized"> <span class="eg">She was my <b class="b">first</b> love.</span></div></span></div>
- <div class="def-block pad-indent" data-wl-senseid="ID_00019069_08"><p class="def-head semi-flush"><span class="def-info"><span class="freq">›</span> <span class="gram"><a href="https://dictionary.cambridge.org/help/codes.html">[<span class="gcs"> <span title="A word or phrase such as 'Mr' or 'dear' used when speaking to someone." class="gc">as form of address</span> </span>]</a></span> <span class="lab"><span title="British English" class="region">UK</span> <span title="Used in relaxed situations, for example with friends and family. Used more in speech." class="usage">informal</span></span></span> <b class="def">used as a <a class="query" href="https://dictionary.cambridge.org/dictionary/english/friendly" title="friendly">friendly</a> <a class="query" href="https://dictionary.cambridge.org/dictionary/english/form" title="form">form</a> of <a class="query" href="https://dictionary.cambridge.org/dictionary/english/address" title="address">address</a>: </b></p><span class="def-body"><div class="examp emphasized"><span title="Example" class="eg">You <a class="query" href="https://dictionary.cambridge.org/dictionary/english/look" title="look">look</a> <a class="query" href="https://dictionary.cambridge.org/dictionary/english/tired" title="tired">tired</a>, love.</span></div><div class="examp emphasized"> <span title="Example" class="eg">That'll be four <a class="query" href="https://dictionary.cambridge.org/dictionary/english/pound" title="pounds">pounds</a> <a class="query" href="https://dictionary.cambridge.org/dictionary/english/exactly" title="exactly">exactly</a>, love.</span></div></span></div>
+ <div class="def-block pad-indent" data-wl-senseid="ID_00019069_08"><p class="def-head semi-flush"><span class="def-info"><span class="freq">›</span> <span class="gram"><a href="https://dictionary.cambridge.org/zhs/help/codes.html">[<span class="gcs"> <span class="gc">as form of address</span> </span>]</a></span> <span class="lab"><span class="region">UK</span> <span class="usage">informal</span></span></span> <b class="def">used as a <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD/friendly" title="friendly">friendly</a> <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD/form" title="form">form</a> of <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD/address" title="address">address</a>: </b></p><span class="def-body"><div class="examp emphasized"><span class="eg">You <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD/look" title="look">look</a> <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD/tired" title="tired">tired</a>, love.</span></div><div class="examp emphasized"> <span class="eg">That'll be four <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD/pound" title="pounds">pounds</a> <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD/exactly" title="exactly">exactly</a>, love.</span></div></span></div>
- <div class="def-block pad-indent" data-wl-senseid="ID_00019069_09"><p class="def-head semi-flush"><span class="def-info"><span class="epp-xref A2" title="A2: Elementary level. English Vocabulary Profile symbols A1-C2 show which words and phrases learners know at each level.">A2</span> <span class="gram"><a href="https://dictionary.cambridge.org/help/codes.html">[<span class="gcs"> <span title="Uncountable noun: noun with no plural form. Cannot be used with 'a', 'an', or 'one'." class="gc">U</span> </span>]</a></span> <span title="Used in relaxed situations, for example with friends and family. Used more in speech." class="lab"><span title="Used in relaxed situations, for example with friends and family. Used more in speech." class="usage">informal</span></span> <span title="Variant information" class="var"><span class="lab">also</span> <span title="Variant form" class="v">love from</span>, </span><span title="Variant information" class="var"><span title="Variant form" class="v">all my love</span></span></span> <b class="def">used before <a class="query" href="https://dictionary.cambridge.org/dictionary/english/your" title="your">your</a> <a class="query" href="https://dictionary.cambridge.org/dictionary/english/name" title="name">name</a> at the end of <a class="query" href="https://dictionary.cambridge.org/dictionary/english/letter" title="letters">letters</a>, <a class="query" href="https://dictionary.cambridge.org/dictionary/english/card" title="cards">cards</a>, etc. to <a class="query" href="https://dictionary.cambridge.org/dictionary/english/friend" title="friends">friends</a> or <a class="query" href="https://dictionary.cambridge.org/dictionary/english/family" title="family">family</a>: </b></p><span class="def-body"><div class="examp emphasized"><span title="Example" class="eg"><a class="query" href="https://dictionary.cambridge.org/dictionary/english/see" title="See">See</a> you at <a class="query" href="https://dictionary.cambridge.org/dictionary/english/christmas" title="Christmas">Christmas</a>. Love, Kate.</span></div></span></div>
- <div class="phrase-block pad-indent"><span class="phrase-head"><span title="Phrase" class="phrase-title"><span class="phrase">be in love</span></span></span><div class="phrase-body pad-indent">
- <div class="def-block pad-indent" data-wl-senseid="ID_00019069_10"><p class="def-head semi-flush"><span class="def-info"><span class="epp-xref B1" title="B1: Intermediate level. English Vocabulary Profile symbols A1-C2 show which words and phrases learners know at each level.">B1</span> </span><b class="def">to love someone in a <a class="query" href="https://dictionary.cambridge.org/dictionary/english/romantic" title="romantic">romantic</a> and <a class="query" href="https://dictionary.cambridge.org/dictionary/english/sexual" title="sexual">sexual</a> way: </b></p><span class="def-body"><div class="examp emphasized"><span title="Example" class="eg">I'm in love for the first <a class="query" href="https://dictionary.cambridge.org/dictionary/english/time" title="time">time</a> and it's <a class="query" href="https://dictionary.cambridge.org/dictionary/english/wonderful" title="wonderful">wonderful</a>.</span></div><div class="examp emphasized"> <span title="Example" class="eg">They're still <span class="b"><a class="query" href="https://dictionary.cambridge.org/dictionary/english/madly" title="madly">madly</a></span> in love (<span class="b">with</span> each other).</span></div></span></div>
- </div></div><div class="phrase-block pad-indent"><span class="phrase-head"><span title="Phrase" class="phrase-title"><span class="phrase">fall in love (with <span title="sb: abbreviation for somebody." class="obj">sb</span>)</span></span></span><div class="phrase-body pad-indent">
- <div class="def-block pad-indent" data-wl-senseid="ID_00019069_11"><p class="def-head semi-flush"><span class="def-info"><span class="epp-xref B1" title="B1: Intermediate level. English Vocabulary Profile symbols A1-C2 show which words and phrases learners know at each level.">B1</span> </span><b class="def">to <a class="query" href="https://dictionary.cambridge.org/dictionary/english/start" title="start">start</a> to love someone <a class="query" href="https://dictionary.cambridge.org/dictionary/english/romantic" title="romantically">romantically</a> and <a class="query" href="https://dictionary.cambridge.org/dictionary/english/sexually" title="sexually">sexually</a>: </b></p><span class="def-body"><div class="examp emphasized"><span title="Example" class="eg">I was 20 when I first <a class="query" href="https://dictionary.cambridge.org/dictionary/english/fell" title="fell">fell</a> in love.</span></div></span></div>
- </div></div>
- <div class="extraexamps"><p class="accord-basic js-accord accord-basic--shallow">More examples</p><ul class="unstyled emphasized pad-indent"><li class="eg">Over the <a class="query" href="https://dictionary.cambridge.org/dictionary/english/year" title="years">years</a>, her love for him <a class="query" href="https://dictionary.cambridge.org/dictionary/english/deepen" title="deepened">deepened</a>.</li><li class="eg">He <a class="query" href="https://dictionary.cambridge.org/dictionary/english/wrote" title="wrote">wrote</a> her a <a class="query" href="https://dictionary.cambridge.org/dictionary/english/poem" title="poem">poem</a> as an <a class="query" href="https://dictionary.cambridge.org/dictionary/english/expression" title="expression">expression</a> of his love.</li><li class="eg">I give you this <a class="query" href="https://dictionary.cambridge.org/dictionary/english/ring" title="ring">ring</a> as a <a class="query" href="https://dictionary.cambridge.org/dictionary/english/pledge" title="pledge">pledge</a> of my <a class="query" href="https://dictionary.cambridge.org/dictionary/english/everlasting" title="everlasting">everlasting</a> love for you.</li><li class="eg">Her <a class="query" href="https://dictionary.cambridge.org/dictionary/english/latest" title="latest">latest</a> <a class="query" href="https://dictionary.cambridge.org/dictionary/english/novel" title="novel">novel</a> is a <a class="query" href="https://dictionary.cambridge.org/dictionary/english/searing" title="searing">searing</a> <a class="query" href="https://dictionary.cambridge.org/dictionary/english/tale" title="tale">tale</a> of love and <a class="query" href="https://dictionary.cambridge.org/dictionary/english/hate" title="hate">hate</a>.</li><li class="eg">She was <a class="query" href="https://dictionary.cambridge.org/dictionary/english/torn" title="torn">torn</a> between <a class="query" href="https://dictionary.cambridge.org/dictionary/english/loyalty" title="loyalty">loyalty</a> to her <a class="query" href="https://dictionary.cambridge.org/dictionary/english/father" title="father">father</a> and love for her <a class="query" href="https://dictionary.cambridge.org/dictionary/english/husband" title="husband">husband</a> .</li></ul></div>
+ <div class="def-block pad-indent" data-wl-senseid="ID_00019069_09"><p class="def-head semi-flush"><span class="def-info"><span class="epp-xref A2">A2</span> <span class="gram"><a href="https://dictionary.cambridge.org/zhs/help/codes.html">[<span class="gcs"> <span class="gc">U</span> </span>]</a></span> <span class="lab"><span class="usage">informal</span></span> <span class="var"><span class="lab">also</span> <b class="v">love from</b>, </span><span class="var"><b class="v">all my love</b></span></span> <b class="def">used before <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD/your" title="your">your</a> <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD/name" title="name">name</a> at the end of <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD/capital" title="letters">letters</a>, <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD/cards" title="cards">cards</a>, etc. to <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD/friend" title="friends">friends</a> or <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD/family" title="family">family</a>: </b></p><span class="def-body"><div class="examp emphasized"><span class="eg"><a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD/see" title="See">See</a> you at <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD/christmas" title="Christmas">Christmas</a>. Love, Kate.</span></div></span></div>
+ <div class="phrase-block pad-indent"><span class="phrase-head"><span class="phrase-title"><b class="phrase">be in love</b></span></span><div class="phrase-body pad-indent">
+ <div class="def-block pad-indent" data-wl-senseid="ID_00019069_10"><p class="def-head semi-flush"><span class="def-info"><span class="epp-xref B1">B1</span> </span><b class="def">to love someone in a <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD/romantic" title="romantic">romantic</a> and <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD/sexual" title="sexual">sexual</a> way: </b></p><span class="def-body"><div class="examp emphasized"><span class="eg">I'm in love for the first <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD/time" title="time">time</a> and it's <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD/wonderful" title="wonderful">wonderful</a>.</span></div><div class="examp emphasized"> <span class="eg">They're still <b class="b"><a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD/madly" title="madly">madly</a></b> in love (<b class="b">with</b> each other).</span></div></span></div>
+ </div></div><div class="phrase-block pad-indent"><span class="phrase-head"><span class="phrase-title"><b class="phrase">fall in love (with <i class="obj">sb</i>)</b></span></span><div class="phrase-body pad-indent">
+ <div class="def-block pad-indent" data-wl-senseid="ID_00019069_11"><p class="def-head semi-flush"><span class="def-info"><span class="epp-xref B1">B1</span> </span><b class="def">to <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD/start" title="start">start</a> to love someone <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD/romantic" title="romantically">romantically</a> and <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD/sexually" title="sexually">sexually</a>: </b></p><span class="def-body"><div class="examp emphasized"><span class="eg">I was 20 when I first <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD/fell" title="fell">fell</a> in love.</span></div></span></div>
+ </div></div>
+ <div class="extraexamps"><p class="accord-basic js-accord accord-basic--shallow">更多范例</p><ul class="unstyled emphasized pad-indent"><li class="eg">Over the <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD/year" title="years">years</a>, her love for him <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD/deepen" title="deepened">deepened</a>.</li><li class="eg">He <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD/wrote" title="wrote">wrote</a> her a <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD/poem" title="poem">poem</a> as an <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD/expression" title="expression">expression</a> of his love.</li><li class="eg">I give you this <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD/ring" title="ring">ring</a> as a <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD/pledge" title="pledge">pledge</a> of my <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD/everlasting" title="everlasting">everlasting</a> love for you.</li><li class="eg">Her <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD/latest" title="latest">latest</a> <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD/novel" title="novel">novel</a> is a <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD/searing" title="searing">searing</a> <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD/tale" title="tale">tale</a> of love and <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD/hate" title="hate">hate</a>.</li><li class="eg">She was <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD/torn" title="torn">torn</a> between <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD/loyal" title="loyalty">loyalty</a> to her <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD/father" title="father">father</a> and love for her <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD/husband" title="husband">husband</a> .</li></ul></div>
</div>
-
<div class="smartt">
- <p class="accord-basic js-accord accord-basic--shallow">Thesaurus: synonyms and related words</p>
- <div>
- <p>
- <a href="https://dictionary.cambridge.org/topics/liking-and-attractiveness/loving-and-in-love/" class="cdo-topic cdo-link" title="Synonyms and related words for love in the Loving and in love topic">Loving and in love</a>
- </p>
- <div class="txt-block cloud rounded">
- <div class="cdo-cloud-content">
- <ul class="unstyled inline">
- <li>
- <a title="absence" class="topic_0 odd " href=" https://dictionary.cambridge.org/dictionary/british/absence?topic=loving-and-in-love ">
- <span class="results"><span class="base"><b class="hw">absence</b></span></span>
- </a>
- </li>
- <li>
- <a title="absence makes the heart grow fonder idiom" class="topic_0 even " href=" https://dictionary.cambridge.org/dictionary/british/absence-makes-the-heart-grow-fonder?topic=loving-and-in-love ">
- <span class="results"><span class="base"><b class="phrase">absence makes the heart grow fonder</b></span> <span class="pos">idiom</span> </span>
- </a>
- </li>
- <li>
- <a title="adoring" class="topic_0 odd " href=" https://dictionary.cambridge.org/dictionary/british/adoring?topic=loving-and-in-love ">
- <span class="results"><span class="base"><b class="hw">adoring</b></span></span>
- </a>
- </li>
- <li>
- <a title="affection" class="topic_0 even " href=" https://dictionary.cambridge.org/dictionary/british/affection?topic=loving-and-in-love ">
- <span class="results"><span class="base"><b class="hw">affection</b></span></span>
- </a>
- </li>
- <li>
- <a title="apple" class="topic_0 odd " href=" https://dictionary.cambridge.org/dictionary/british/apple?topic=loving-and-in-love ">
- <span class="results"><span class="base"><b class="hw">apple</b></span></span>
- </a>
- </li>
- <li>
- <a title="dear" class="topic_3 even " href=" https://dictionary.cambridge.org/dictionary/british/dear?topic=loving-and-in-love ">
- <span class="results"><span class="base"><b class="hw">dear</b></span></span>
- </a>
- </li>
- <li>
- <a title="fall in love idiom" class="topic_1 odd " href=" https://dictionary.cambridge.org/dictionary/british/fall-in-love?topic=loving-and-in-love ">
- <span class="results"><span class="base"><b class="phrase">fall in love</b></span> <span class="pos">idiom</span> </span>
- </a>
- </li>
- <li>
- <a title="fondly" class="topic_1 even " href=" https://dictionary.cambridge.org/dictionary/british/fondly?topic=loving-and-in-love ">
- <span class="results"><span class="base"><b class="hw">fondly</b></span></span>
- </a>
- </li>
- <li>
- <a title="gaga" class="topic_3 odd " href=" https://dictionary.cambridge.org/dictionary/british/gaga?topic=loving-and-in-love ">
- <span class="results"><span class="base"><b class="hw">gaga</b></span></span>
- </a>
- </li>
- <li>
- <a title="have (got) it bad idiom" class="topic_1 even " href=" https://dictionary.cambridge.org/dictionary/british/have-got-it-bad?topic=loving-and-in-love ">
- <span class="results"><span class="base"><b class="phrase">have (got) it bad</b></span> <span class="pos">idiom</span> </span>
- </a>
- </li>
- <li>
- <a title="head over heels (in love) idiom" class="topic_1 odd " href=" https://dictionary.cambridge.org/dictionary/british/head-over-heels-in-love?topic=loving-and-in-love ">
- <span class="results"><span class="base"><b class="phrase">head over heels (in love)</b></span> <span class="pos">idiom</span> </span>
- </a>
- </li>
- <li>
- <a title="infatuated" class="topic_1 even " href=" https://dictionary.cambridge.org/dictionary/british/infatuated?topic=loving-and-in-love ">
- <span class="results"><span class="base"><b class="hw">infatuated</b></span></span>
- </a>
- </li>
- <li>
- <a title="lose" class="topic_3 odd " href=" https://dictionary.cambridge.org/dictionary/british/lose?topic=loving-and-in-love ">
- <span class="results"><span class="base"><b class="hw">lose</b></span></span>
- </a>
- </li>
- <li>
- <a title="moon over sb/sth" class="topic_2 even " href=" https://dictionary.cambridge.org/dictionary/british/moon-over-sb-sth?topic=loving-and-in-love ">
- <span class="results"><span class="base"><b class="phrase">moon over <i class="obj" title="sb/sth: abbreviation for somebody or something.">sb/sth</i></b></span></span>
- </a>
- </li>
- <li>
- <a title="puppy love" class="topic_2 odd " href=" https://dictionary.cambridge.org/dictionary/british/puppy-love?topic=loving-and-in-love ">
- <span class="results"><span class="base"><b class="hw">puppy love</b></span></span>
- </a>
- </li>
- <li>
- <a title="romance" class="topic_3 even " href=" https://dictionary.cambridge.org/dictionary/british/romance?topic=loving-and-in-love ">
- <span class="results"><span class="base"><b class="hw">romance</b></span></span>
- </a>
- </li>
- <li>
- <a title="romantic" class="topic_2 odd " href=" https://dictionary.cambridge.org/dictionary/british/romantic?topic=loving-and-in-love ">
- <span class="results"><span class="base"><b class="hw">romantic</b></span></span>
- </a>
- </li>
- <li>
- <a title="shine" class="topic_3 even " href=" https://dictionary.cambridge.org/dictionary/british/shine?topic=loving-and-in-love ">
- <span class="results"><span class="base"><b class="hw">shine</b></span></span>
- </a>
- </li>
- <li>
- <a title="smitten" class="topic_2 odd " href=" https://dictionary.cambridge.org/dictionary/british/smitten?topic=loving-and-in-love ">
- <span class="results"><span class="base"><b class="hw">smitten</b></span></span>
- </a>
- </li>
- <li>
- <a title="stuck" class="topic_2 even " href=" https://dictionary.cambridge.org/dictionary/british/stuck?topic=loving-and-in-love ">
- <span class="results"><span class="base"><b class="hw">stuck</b></span></span>
- </a>
- </li>
- </ul>
- </div>
- <p><a href="https://dictionary.cambridge.org/topics/liking-and-attractiveness/loving-and-in-love/" title="Synonyms and related words for love in the Loving and in love topic"><b>See more results »</b></a></p>
- </div>
+ <p class="accord-basic js-accord accord-basic--shallow">词库：同义词和关联词</p>
+ <div>
+ <p>
+ <a href="https://dictionary.cambridge.org/zhs/topics/liking-and-attractiveness/loving-and-in-love/" class="cdo-topic cdo-link" title="在Loving and in love话题中love的同义词和相关词">Loving and in love</a>
+ </p>
+ <div class="txt-block cloud rounded">
+ <div class="cdo-cloud-content">
+ <ul class="unstyled inline">
+ <li>
+ <a title="absence" class="topic_0 odd " href=" https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD/absence?topic=loving-and-in-love ">
+ <span class="results"><span class="base"><b class="hw">absence</b></span></span>
+ </a>
+ </li>
+ <li>
+ <a title="absence makes the heart grow fonder idiom" class="topic_0 even " href=" https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD/absence-makes-the-heart-grow-fonder?topic=loving-and-in-love ">
+ <span class="results"><span class="base"><b class="phrase">absence makes the heart grow fonder</b></span> <span class="pos">idiom</span> </span>
+ </a>
+ </li>
+ <li>
+ <a title="adoring" class="topic_0 odd " href=" https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD/adoring?topic=loving-and-in-love ">
+ <span class="results"><span class="base"><b class="hw">adoring</b></span></span>
+ </a>
+ </li>
+ <li>
+ <a title="affection" class="topic_0 even " href=" https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD/affection?topic=loving-and-in-love ">
+ <span class="results"><span class="base"><b class="hw">affection</b></span></span>
+ </a>
+ </li>
+ <li>
+ <a title="apple" class="topic_0 odd " href=" https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD/apple?topic=loving-and-in-love ">
+ <span class="results"><span class="base"><b class="hw">apple</b></span></span>
+ </a>
+ </li>
+ <li>
+ <a title="dear" class="topic_3 even " href=" https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD/dear?topic=loving-and-in-love ">
+ <span class="results"><span class="base"><b class="hw">dear</b></span></span>
+ </a>
+ </li>
+ <li>
+ <a title="fondly" class="topic_1 odd " href=" https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD/fondly?topic=loving-and-in-love ">
+ <span class="results"><span class="base"><b class="hw">fondly</b></span></span>
+ </a>
+ </li>
+ <li>
+ <a title="gaga" class="topic_3 even " href=" https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD/gaga?topic=loving-and-in-love ">
+ <span class="results"><span class="base"><b class="hw">gaga</b></span></span>
+ </a>
+ </li>
+ <li>
+ <a title="have (got) it bad idiom" class="topic_1 odd " href=" https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD/have-got-it-bad?topic=loving-and-in-love ">
+ <span class="results"><span class="base"><b class="phrase">have (got) it bad</b></span> <span class="pos">idiom</span> </span>
+ </a>
+ </li>
+ <li>
+ <a title="head over heels (in love) idiom" class="topic_1 even " href=" https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD/head-over-heels-in-love?topic=loving-and-in-love ">
+ <span class="results"><span class="base"><b class="phrase">head over heels (in love)</b></span> <span class="pos">idiom</span> </span>
+ </a>
+ </li>
+ <li>
+ <a title="infatuated" class="topic_1 odd " href=" https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD/infatuated?topic=loving-and-in-love ">
+ <span class="results"><span class="base"><b class="hw">infatuated</b></span></span>
+ </a>
+ </li>
+ <li>
+ <a title="infatuation" class="topic_1 even " href=" https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD/infatuation?topic=loving-and-in-love ">
+ <span class="results"><span class="base"><b class="hw">infatuation</b></span></span>
+ </a>
+ </li>
+ <li>
+ <a title="lose" class="topic_3 odd " href=" https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD/lose?topic=loving-and-in-love ">
+ <span class="results"><span class="base"><b class="hw">lose</b></span></span>
+ </a>
+ </li>
+ <li>
+ <a title="potty" class="topic_2 even " href=" https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD/potty?topic=loving-and-in-love ">
+ <span class="results"><span class="base"><b class="hw">potty</b></span></span>
+ </a>
+ </li>
+ <li>
+ <a title="puppy love" class="topic_2 odd " href=" https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD/puppy-love?topic=loving-and-in-love ">
+ <span class="results"><span class="base"><b class="hw">puppy love</b></span></span>
+ </a>
+ </li>
+ <li>
+ <a title="romance" class="topic_3 even " href=" https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD/romance?topic=loving-and-in-love ">
+ <span class="results"><span class="base"><b class="hw">romance</b></span></span>
+ </a>
+ </li>
+ <li>
+ <a title="romantic" class="topic_2 odd " href=" https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD/romantic?topic=loving-and-in-love ">
+ <span class="results"><span class="base"><b class="hw">romantic</b></span></span>
+ </a>
+ </li>
+ <li>
+ <a title="shine" class="topic_3 even " href=" https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD/shine?topic=loving-and-in-love ">
+ <span class="results"><span class="base"><b class="hw">shine</b></span></span>
+ </a>
+ </li>
+ <li>
+ <a title="smitten" class="topic_2 odd " href=" https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD/smitten?topic=loving-and-in-love ">
+ <span class="results"><span class="base"><b class="hw">smitten</b></span></span>
+ </a>
+ </li>
+ <li>
+ <a title="stuck" class="topic_2 even " href=" https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD/stuck?topic=loving-and-in-love ">
+ <span class="results"><span class="base"><b class="hw">stuck</b></span></span>
+ </a>
+ </li>
+ </ul>
+ </div>
+ <p><a href="https://dictionary.cambridge.org/zhs/topics/liking-and-attractiveness/loving-and-in-love/" title="在Loving and in love话题中love的同义词和相关词"><b>查看更多结果»</b></a></p>
+ </div>
- <div>
- <p class="semi-flush">You can also find related words, phrases, and synonyms in the topics:</p>
- <div><a href="https://dictionary.cambridge.org/topics/communication/written-greetings/" class="cdo-topic cdo-link" title="Synonyms and related words for love in the Written greetings topic">Written greetings</a></div>
- </div>
- </div>
- </div>
+ <div>
+ <p class="semi-flush">你还可以在这些话题中找到相关的词、词组和同义词：</p>
+ <div><a href="https://dictionary.cambridge.org/zhs/topics/communication/written-greetings/" class="cdo-topic cdo-link" title="在Written greetings话题中love的同义词和相关词">Written greetings</a></div>
+ </div>
+ </div>
+ </div>
<div id='ad_contentslot_1' class='am-default contentslot'>
<script type='text/javascript'>
googletag.cmd.push(function() { googletag.display('ad_contentslot_1'); });
</script>
</div>
- </div>
+ </div>
- <div class="sense-block" id="british-1-2-2">
-
- <h3 class="txt-block txt-block--alt2"><span class="hw">love</span> <span class="pos" title="A word that refers to a person, place, idea, event or thing.">noun</span> <span class="guideword" title="Guide word: helps you find the right meaning when a word has more than one meaning">
+ <div class="sense-block" id="cald4-1-2-2"> <h3 class="txt-block txt-block--alt2"><span class="hw">love</span> <span class="pos" title="A word that refers to a person, place, idea, event or thing.">noun</span> <span class="guideword" title="Guide word: helps you find the right meaning when a word has more than one meaning">
(<span>LIKING SOMETHING</span>)
- </span></h3>
- <div class="sense-body">
- <div class="def-block pad-indent" data-wl-senseid="ID_00019069_12"><p class="def-head semi-flush"><span class="def-info"><span title="B2: Upper-Intermediate level. English Vocabulary Profile symbols A1-C2 show which words and phrases learners know at each level." class="epp-xref B2">B2</span> <span class="gram"><a href="https://dictionary.cambridge.org/help/codes.html">[<span class="gcs"> <span title="Uncountable noun: noun with no plural form. Cannot be used with 'a', 'an', or 'one'." class="gc">U</span> </span>]</a></span></span> <b class="def"><a class="query" href="https://dictionary.cambridge.org/dictionary/english/strong" title="strong">strong</a> <a class="query" href="https://dictionary.cambridge.org/dictionary/english/liking" title="liking">liking</a> for: </b></p><span class="def-body"><div class="examp emphasized"><span title="Example" class="eg">I don't <a class="query" href="https://dictionary.cambridge.org/dictionary/english/share" title="share">share</a> my boyfriend's love <span class="b">of</span> <a class="query" href="https://dictionary.cambridge.org/dictionary/english/cooking" title="cooking">cooking</a>.</span></div></span></div>
+ </span></h3> <div class="sense-body">
+ <div class="def-block pad-indent" data-wl-senseid="ID_00019069_12"><p class="def-head semi-flush"><span class="def-info"><span class="epp-xref B2">B2</span> <span class="gram"><a href="https://dictionary.cambridge.org/zhs/help/codes.html">[<span class="gcs"> <span class="gc">U</span> </span>]</a></span></span> <b class="def"><a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD/strong" title="strong">strong</a> <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD/like" title="liking">liking</a> for: </b></p><span class="def-body"><div class="examp emphasized"><span class="eg">I don't <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD/share" title="share">share</a> my boyfriend's love <b class="b">of</b> <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD/cooking" title="cooking">cooking</a>.</span></div></span></div>
- <div class="def-block pad-indent" data-wl-senseid="ID_00019069_13"><p class="def-head semi-flush"><span class="def-info"><span title="B2: Upper-Intermediate level. English Vocabulary Profile symbols A1-C2 show which words and phrases learners know at each level." class="epp-xref B2">B2</span> <span class="gram"><a href="https://dictionary.cambridge.org/help/codes.html">[<span class="gcs"> <span title="Countable noun: a noun that has both singular and plural forms." class="gc">C</span> </span>]</a></span></span> <b class="def">something that you like very much: </b></p><span class="def-body"><div class="examp emphasized"><span title="Example" class="eg">Music is one of her <a class="query" href="https://dictionary.cambridge.org/dictionary/english/great" title="greatest">greatest</a> loves.</span></div></span></div>
+ <div class="def-block pad-indent" data-wl-senseid="ID_00019069_13"><p class="def-head semi-flush"><span class="def-info"><span class="epp-xref B2">B2</span> <span class="gram"><a href="https://dictionary.cambridge.org/zhs/help/codes.html">[<span class="gcs"> <span class="gc">C</span> </span>]</a></span></span> <b class="def">something that you like very much: </b></p><span class="def-body"><div class="examp emphasized"><span class="eg">Music is one of her <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD/great" title="greatest">greatest</a> loves.</span></div></span></div>
- <div class="extraexamps"><p class="accord-basic js-accord accord-basic--shallow">More examples</p><ul class="unstyled emphasized pad-indent"><li class="eg">She never <a class="query" href="https://dictionary.cambridge.org/dictionary/english/hid" title="hid">hid</a> her love of <a class="query" href="https://dictionary.cambridge.org/dictionary/english/diamond" title="diamonds">diamonds</a>.</li><li class="eg">Food is my <a class="query" href="https://dictionary.cambridge.org/dictionary/english/great" title="greatest">greatest</a> love.</li><li class="eg">Opera was my first love.</li><li class="eg">I have a love of <a class="query" href="https://dictionary.cambridge.org/dictionary/english/expensive" title="expensive">expensive</a> <a class="query" href="https://dictionary.cambridge.org/dictionary/english/clothes" title="clothes">clothes</a>.</li><li class="eg">His love of <a class="query" href="https://dictionary.cambridge.org/dictionary/english/gambling" title="gambling">gambling</a> <a class="query" href="https://dictionary.cambridge.org/dictionary/english/drove" title="drove">drove</a> us <a class="query" href="https://dictionary.cambridge.org/dictionary/english/apart" title="apart">apart</a>.</li></ul></div>
+ <div class="extraexamps"><p class="accord-basic js-accord accord-basic--shallow">更多范例</p><ul class="unstyled emphasized pad-indent"><li class="eg">She never <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD/hid" title="hid">hid</a> her love of <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD/diamond" title="diamonds">diamonds</a>.</li><li class="eg">Food is my <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD/great" title="greatest">greatest</a> love.</li><li class="eg">Opera was my first love.</li><li class="eg">I have a love of <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD/expensive" title="expensive">expensive</a> <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD/clothes" title="clothes">clothes</a>.</li><li class="eg">His love of <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD/gamble" title="gambling">gambling</a> <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD/drove" title="drove">drove</a> us <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD/apart" title="apart">apart</a>.</li></ul></div>
</div>
-
<div class="smartt">
- <p class="accord-basic js-accord accord-basic--shallow">Thesaurus: synonyms and related words</p>
- <div>
- <p>
- <a href="https://dictionary.cambridge.org/topics/liking-and-attractiveness/liking/" class="cdo-topic cdo-link" title="Synonyms and related words for love in the Liking topic">Liking</a>
- </p>
- <div class="txt-block cloud rounded">
- <div class="cdo-cloud-content">
- <ul class="unstyled inline">
- <li>
- <a title="affection" class="topic_0 odd " href=" https://dictionary.cambridge.org/dictionary/british/affection?topic=liking ">
- <span class="results"><span class="base"><b class="hw">affection</b></span></span>
- </a>
- </li>
- <li>
- <a title="attached" class="topic_0 even " href=" https://dictionary.cambridge.org/dictionary/british/attached?topic=liking ">
- <span class="results"><span class="base"><b class="hw">attached</b></span></span>
- </a>
- </li>
- <li>
- <a title="be a glutton for sth idiom" class="topic_0 odd " href=" https://dictionary.cambridge.org/dictionary/british/be-a-glutton-for-sth?topic=liking ">
- <span class="results"><span class="base"><b class="phrase">be a glutton for <i title="sth: abbreviation for something." class="obj">sth</i></b></span> <span class="pos">idiom</span> </span>
- </a>
- </li>
- <li>
- <a title="be a hit with sb idiom" class="topic_0 even " href=" https://dictionary.cambridge.org/dictionary/british/be-a-hit-with-sb?topic=liking ">
- <span class="results"><span class="base"><b class="phrase">be a hit with <i class="obj" title="sb: abbreviation for somebody.">sb</i></b></span> <span class="pos">idiom</span> </span>
- </a>
- </li>
- <li>
- <a title="be big on sth idiom" class="topic_0 odd " href=" https://dictionary.cambridge.org/dictionary/british/be-big-on-sth?topic=liking ">
- <span class="results"><span class="base"><b class="phrase">be big on <i title="sth: abbreviation for something." class="obj">sth</i></b></span> <span class="pos">idiom</span> </span>
- </a>
- </li>
- <li>
- <a title="grow" class="topic_3 even " href=" https://dictionary.cambridge.org/dictionary/british/grow?topic=liking ">
- <span class="results"><span class="base"><b class="hw">grow</b></span></span>
- </a>
- </li>
- <li>
- <a title="grow on sb" class="topic_1 odd " href=" https://dictionary.cambridge.org/dictionary/british/grow-on-sb?topic=liking ">
- <span class="results"><span class="base"><b class="phrase">grow on <i title="sb: abbreviation for somebody." class="obj">sb</i></b></span></span>
- </a>
- </li>
- <li>
- <a title="have a lot of time for sb idiom" class="topic_1 even " href=" https://dictionary.cambridge.org/dictionary/british/have-a-lot-of-time-for-sb?topic=liking ">
- <span class="results"><span class="base"><b class="phrase">have a lot of time for <i class="obj" title="sb: abbreviation for somebody.">sb</i></b></span> <span class="pos">idiom</span> </span>
- </a>
- </li>
- <li>
- <a title="have a thing about sth/sb idiom" class="topic_1 odd " href=" https://dictionary.cambridge.org/dictionary/british/have-a-thing-about-sth-sb?topic=liking ">
- <span class="results"><span class="base"><b class="phrase">have a thing about <i class="obj">sth/sb</i></b></span> <span class="pos">idiom</span> </span>
- </a>
- </li>
- <li>
- <a title="lick your lips idiom" class="topic_1 even " href=" https://dictionary.cambridge.org/dictionary/british/lick-your-lips?topic=liking ">
- <span class="results"><span class="base"><b class="phrase">lick <i class="obj" title="You can use my, your, their, etc. here">your</i> lips</b></span> <span class="pos">idiom</span> </span>
- </a>
- </li>
- <li>
- <a title="liking" class="topic_1 odd " href=" https://dictionary.cambridge.org/dictionary/british/liking?topic=liking ">
- <span class="results"><span class="base"><b class="hw">liking</b></span></span>
- </a>
- </li>
- <li>
- <a title="smile on sth/sb" class="topic_2 even " href=" https://dictionary.cambridge.org/dictionary/british/smile-on-sth-sb?topic=liking ">
- <span class="results"><span class="base"><b class="phrase">smile on <i class="obj">sth/sb</i></b></span></span>
- </a>
- </li>
- <li>
- <a title="smitten" class="topic_2 odd " href=" https://dictionary.cambridge.org/dictionary/british/smitten?topic=liking ">
- <span class="results"><span class="base"><b class="hw">smitten</b></span></span>
- </a>
- </li>
- <li>
- <a title="soft corner" class="topic_2 even " href=" https://dictionary.cambridge.org/dictionary/british/soft-corner?topic=liking ">
- <span class="results"><span class="base"><b class="hw">soft corner</b></span></span>
- </a>
- </li>
- <li>
- <a title="soft spot" class="topic_2 odd " href=" https://dictionary.cambridge.org/dictionary/british/soft-spot?topic=liking ">
- <span class="results"><span class="base"><b class="hw">soft spot</b></span></span>
- </a>
- </li>
- <li>
- <a title="take a shine to sb idiom" class="topic_2 even " href=" https://dictionary.cambridge.org/dictionary/british/take-a-shine-to-sb?topic=liking ">
- <span class="results"><span class="base"><b class="phrase">take a shine to <i title="sb: abbreviation for somebody." class="obj">sb</i></b></span> <span class="pos">idiom</span> </span>
- </a>
- </li>
- <li>
- <a title="taste" class="topic_3 odd " href=" https://dictionary.cambridge.org/dictionary/british/taste?topic=liking ">
- <span class="results"><span class="base"><b class="hw">taste</b></span></span>
- </a>
- </li>
- <li>
- <a title="thing" class="topic_3 even " href=" https://dictionary.cambridge.org/dictionary/british/thing?topic=liking ">
- <span class="results"><span class="base"><b class="hw">thing</b></span></span>
- </a>
- </li>
- <li>
- <a title="tight" class="topic_3 odd " href=" https://dictionary.cambridge.org/dictionary/british/tight?topic=liking ">
- <span class="results"><span class="base"><b class="hw">tight</b></span></span>
- </a>
- </li>
- <li>
- <a title="warm" class="topic_3 even " href=" https://dictionary.cambridge.org/dictionary/british/warm?topic=liking ">
- <span class="results"><span class="base"><b class="hw">warm</b></span></span>
- </a>
- </li>
- </ul>
- </div>
- <p><a href="https://dictionary.cambridge.org/topics/liking-and-attractiveness/liking/" title="Synonyms and related words for love in the Liking topic"><b>See more results »</b></a></p>
- </div>
-
- </div>
- </div>
- </div>
-
- <div class="sense-block" id="british-1-2-3">
-
- <h3 class="txt-block txt-block--alt2"><span class="hw">love</span> <span class="pos" title="A word that refers to a person, place, idea, event or thing.">noun</span> <span class="guideword" title="Guide word: helps you find the right meaning when a word has more than one meaning">
- (<span>TENNIS</span>)
- </span></h3>
- <div class="sense-body">
- <div class="def-block pad-indent" data-wl-senseid="ID_00019069_14"><p class="def-head semi-flush"><span class="def-info"><span class="freq">›</span> <span class="gram"><a href="https://dictionary.cambridge.org/help/codes.html">[<span class="gcs"> <span title="Uncountable noun: noun with no plural form. Cannot be used with 'a', 'an', or 'one'." class="gc">U</span> </span>]</a></span></span> <b class="def">(in <a class="query" href="https://dictionary.cambridge.org/dictionary/english/tennis" title="tennis">tennis</a>) the <a class="query" href="https://dictionary.cambridge.org/dictionary/english/state" title="state">state</a> of having no <a class="query" href="https://dictionary.cambridge.org/dictionary/english/point" title="points">points</a>: </b></p><span class="def-body"><div class="examp emphasized"><span title="Example" class="eg">The <a class="query" href="https://dictionary.cambridge.org/dictionary/english/score" title="score">score</a> now <a class="query" href="https://dictionary.cambridge.org/dictionary/english/stand" title="stands">stands</a> at 40–love.</span></div></span></div>
- </div>
+ <p class="accord-basic js-accord accord-basic--shallow">词库：同义词和关联词</p>
+ <div>
+ <p>
+ <a href="https://dictionary.cambridge.org/zhs/topics/liking-and-attractiveness/liking/" class="cdo-topic cdo-link" title="在Liking话题中love的同义词和相关词">Liking</a>
+ </p>
+ <div class="txt-block cloud rounded">
+ <div class="cdo-cloud-content">
+ <ul class="unstyled inline">
+ <li>
+ <a title="affection" class="topic_0 odd " href=" https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD/affection?topic=liking ">
+ <span class="results"><span class="base"><b class="hw">affection</b></span></span>
+ </a>
+ </li>
+ <li>
+ <a title="attached" class="topic_0 even " href=" https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD/attached?topic=liking ">
+ <span class="results"><span class="base"><b class="hw">attached</b></span></span>
+ </a>
+ </li>
+ <li>
+ <a title="be a glutton for sth idiom" class="topic_0 odd " href=" https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD/be-a-glutton-for-sth?topic=liking ">
+ <span class="results"><span class="base"><b class="phrase">be a glutton for <i title="sth: abbreviation for something." class="obj">sth</i></b></span> <span class="pos">idiom</span> </span>
+ </a>
+ </li>
+ <li>
+ <a title="be a hit with sb idiom" class="topic_0 even " href=" https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD/be-a-hit-with-sb?topic=liking ">
+ <span class="results"><span class="base"><b class="phrase">be a hit with <i title="sb: abbreviation for somebody." class="obj">sb</i></b></span> <span class="pos">idiom</span> </span>
+ </a>
+ </li>
+ <li>
+ <a title="be big on sth idiom" class="topic_0 odd " href=" https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD/be-big-on-sth?topic=liking ">
+ <span class="results"><span class="base"><b class="phrase">be big on <i title="sth: abbreviation for something." class="obj">sth</i></b></span> <span class="pos">idiom</span> </span>
+ </a>
+ </li>
+ <li>
+ <a title="grow" class="topic_3 even " href=" https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD/grow?topic=liking ">
+ <span class="results"><span class="base"><b class="hw">grow</b></span></span>
+ </a>
+ </li>
+ <li>
+ <a title="have a lot of time for sb idiom" class="topic_1 odd " href=" https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD/have-a-lot-of-time-for-sb?topic=liking ">
+ <span class="results"><span class="base"><b class="phrase">have a lot of time for <i title="sb: abbreviation for somebody." class="obj">sb</i></b></span> <span class="pos">idiom</span> </span>
+ </a>
+ </li>
+ <li>
+ <a title="have a thing about sth/sb idiom" class="topic_1 even " href=" https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD/have-a-thing-about-sth-sb?topic=liking ">
+ <span class="results"><span class="base"><b class="phrase">have a thing about <i class="obj">sth/sb</i></b></span> <span class="pos">idiom</span> </span>
+ </a>
+ </li>
+ <li>
+ <a title="heart" class="topic_3 odd " href=" https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD/heart?topic=liking ">
+ <span class="results"><span class="base"><b class="hw">heart</b></span></span>
+ </a>
+ </li>
+ <li>
+ <a title="lick your lips idiom" class="topic_1 even " href=" https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD/lick-your-lips?topic=liking ">
+ <span class="results"><span class="base"><b class="phrase">lick <i title="You can use my, your, their, etc. here" class="obj">your</i> lips</b></span> <span class="pos">idiom</span> </span>
+ </a>
+ </li>
+ <li>
+ <a title="liking" class="topic_1 odd " href=" https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD/liking?topic=liking ">
+ <span class="results"><span class="base"><b class="hw">liking</b></span></span>
+ </a>
+ </li>
+ <li>
+ <a title="look kindly on sb/sth idiom" class="topic_1 even " href=" https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD/look-kindly-on-sb-sth?topic=liking ">
+ <span class="results"><span class="base"><b class="phrase">look kindly on <i title="sb/sth: abbreviation for somebody or something." class="obj">sb/sth</i></b></span> <span class="pos">idiom</span> </span>
+ </a>
+ </li>
+ <li>
+ <a title="smile on sth/sb" class="topic_2 odd " href=" https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD/smile-on-sth-sb?topic=liking ">
+ <span class="results"><span class="base"><b class="phrase">smile on <i class="obj">sth/sb</i></b></span></span>
+ </a>
+ </li>
+ <li>
+ <a title="smitten" class="topic_2 even " href=" https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD/smitten?topic=liking ">
+ <span class="results"><span class="base"><b class="hw">smitten</b></span></span>
+ </a>
+ </li>
+ <li>
+ <a title="soft corner" class="topic_2 odd " href=" https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD/soft-corner?topic=liking ">
+ <span class="results"><span class="base"><b class="hw">soft corner</b></span></span>
+ </a>
+ </li>
+ <li>
+ <a title="soft spot" class="topic_2 even " href=" https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD/soft-spot?topic=liking ">
+ <span class="results"><span class="base"><b class="hw">soft spot</b></span></span>
+ </a>
+ </li>
+ <li>
+ <a title="take a shine to sb idiom" class="topic_2 odd " href=" https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD/take-a-shine-to-sb?topic=liking ">
+ <span class="results"><span class="base"><b class="phrase">take a shine to <i title="sb: abbreviation for somebody." class="obj">sb</i></b></span> <span class="pos">idiom</span> </span>
+ </a>
+ </li>
+ <li>
+ <a title="taste" class="topic_3 even " href=" https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD/taste?topic=liking ">
+ <span class="results"><span class="base"><b class="hw">taste</b></span></span>
+ </a>
+ </li>
+ <li>
+ <a title="thing" class="topic_3 odd " href=" https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD/thing?topic=liking ">
+ <span class="results"><span class="base"><b class="hw">thing</b></span></span>
+ </a>
+ </li>
+ <li>
+ <a title="warm" class="topic_3 even " href=" https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD/warm?topic=liking ">
+ <span class="results"><span class="base"><b class="hw">warm</b></span></span>
+ </a>
+ </li>
+ </ul>
+ </div>
+ <p><a href="https://dictionary.cambridge.org/zhs/topics/liking-and-attractiveness/liking/" title="在Liking话题中love的同义词和相关词"><b>查看更多结果»</b></a></p>
+ </div>
- <div class="smartt">
- <p class="accord-basic js-accord accord-basic--shallow">Thesaurus: synonyms and related words</p>
- <div>
- <p>
- <a href="https://dictionary.cambridge.org/topics/sports/tennis-and-racket-sports/" class="cdo-topic cdo-link" title="Synonyms and related words for love in the Tennis & racket sports topic">Tennis & racket sports</a>
- </p>
- <div class="txt-block cloud rounded">
- <div class="cdo-cloud-content">
- <ul class="unstyled inline">
- <li>
- <a title="ball boy/girl" class="topic_2 odd " href=" https://dictionary.cambridge.org/dictionary/british/ball-boy-girl?topic=tennis-and-racket-sports ">
- <span class="results"><span class="base"><b class="hw">ball boy/girl</b></span></span>
- </a>
- </li>
- <li>
- <a title="bird" class="topic_0 even " href=" https://dictionary.cambridge.org/dictionary/british/bird?topic=tennis-and-racket-sports ">
- <span class="results"><span class="base"><b class="hw">bird</b></span></span>
- </a>
- </li>
- <li>
- <a title="birdie" class="topic_1 odd " href=" https://dictionary.cambridge.org/dictionary/british/birdie?topic=tennis-and-racket-sports ">
- <span class="results"><span class="base"><b class="hw">birdie</b></span></span>
- </a>
- </li>
- <li>
- <a title="break point" class="topic_3 even " href=" https://dictionary.cambridge.org/dictionary/british/break-point?topic=tennis-and-racket-sports ">
- <span class="results"><span class="base"><b class="hw">break point</b></span></span>
- </a>
- </li>
- <li>
- <a title="deuce" class="topic_1 odd " href=" https://dictionary.cambridge.org/dictionary/british/deuce?topic=tennis-and-racket-sports ">
- <span class="results"><span class="base"><b class="hw">deuce</b></span></span>
- </a>
- </li>
- <li>
- <a title="double" class="topic_3 even " href=" https://dictionary.cambridge.org/dictionary/british/double?topic=tennis-and-racket-sports ">
- <span class="results"><span class="base"><b class="hw">double</b></span></span>
- </a>
- </li>
- <li>
- <a title="fault" class="topic_2 odd " href=" https://dictionary.cambridge.org/dictionary/british/fault?topic=tennis-and-racket-sports ">
- <span class="results"><span class="base"><b class="hw">fault</b></span></span>
- </a>
- </li>
- <li>
- <a title="groundstroke" class="topic_0 even " href=" https://dictionary.cambridge.org/dictionary/british/groundstroke?topic=tennis-and-racket-sports ">
- <span class="results"><span class="base"><b class="hw">groundstroke</b></span></span>
- </a>
- </li>
- <li>
- <a title="half-volley" class="topic_0 odd " href=" https://dictionary.cambridge.org/dictionary/british/half-volley?topic=tennis-and-racket-sports ">
- <span class="results"><span class="base"><b class="hw">half-volley</b></span></span>
- </a>
- </li>
- <li>
- <a title="knock" class="topic_0 even " href=" https://dictionary.cambridge.org/dictionary/british/knock?topic=tennis-and-racket-sports ">
- <span class="results"><span class="base"><b class="hw">knock</b></span></span>
- </a>
- </li>
- <li>
- <a title="lawn tennis" class="topic_1 odd " href=" https://dictionary.cambridge.org/dictionary/british/lawn-tennis?topic=tennis-and-racket-sports ">
- <span class="results"><span class="base"><b class="hw">lawn tennis</b></span></span>
- </a>
- </li>
- <li>
- <a title="let" class="topic_3 even " href=" https://dictionary.cambridge.org/dictionary/british/let?topic=tennis-and-racket-sports ">
- <span class="results"><span class="base"><b class="hw">let</b></span></span>
- </a>
- </li>
- <li>
- <a title="match point" class="topic_3 odd " href=" https://dictionary.cambridge.org/dictionary/british/match-point?topic=tennis-and-racket-sports ">
- <span class="results"><span class="base"><b class="hw">match point</b></span></span>
- </a>
- </li>
- <li>
- <a title="passing shot" class="topic_2 even " href=" https://dictionary.cambridge.org/dictionary/british/passing-shot?topic=tennis-and-racket-sports ">
- <span class="results"><span class="base"><b class="hw">passing shot</b></span></span>
- </a>
- </li>
- <li>
- <a title="racket" class="topic_1 odd " href=" https://dictionary.cambridge.org/dictionary/british/racket?topic=tennis-and-racket-sports ">
- <span class="results"><span class="base"><b class="hw">racket</b></span></span>
- </a>
- </li>
- <li>
- <a title="racquetball" class="topic_0 even " href=" https://dictionary.cambridge.org/dictionary/british/racquetball?topic=tennis-and-racket-sports ">
- <span class="results"><span class="base"><b class="hw">racquetball</b></span></span>
- </a>
- </li>
- <li>
- <a title="rally" class="topic_2 odd " href=" https://dictionary.cambridge.org/dictionary/british/rally?topic=tennis-and-racket-sports ">
- <span class="results"><span class="base"><b class="hw">rally</b></span></span>
- </a>
- </li>
- <li>
- <a title="seed" class="topic_2 even " href=" https://dictionary.cambridge.org/dictionary/british/seed?topic=tennis-and-racket-sports ">
- <span class="results"><span class="base"><b class="hw">seed</b></span></span>
- </a>
- </li>
- <li>
- <a title="single" class="topic_3 odd " href=" https://dictionary.cambridge.org/dictionary/british/single?topic=tennis-and-racket-sports ">
- <span class="results"><span class="base"><b class="hw">single</b></span></span>
- </a>
- </li>
- <li>
- <a title="tennis shoe" class="topic_1 even " href=" https://dictionary.cambridge.org/dictionary/british/tennis-shoe?topic=tennis-and-racket-sports ">
- <span class="results"><span class="base"><b class="hw">tennis shoe</b></span></span>
- </a>
- </li>
- </ul>
- </div>
- <p><a href="https://dictionary.cambridge.org/topics/sports/tennis-and-racket-sports/" title="Synonyms and related words for love in the Tennis & racket sports topic"><b>See more results »</b></a></p>
</div>
+ </div>
+ </div>
- </div>
+ <div class="sense-block" id="cald4-1-2-3"> <h3 class="txt-block txt-block--alt2"><span class="hw">love</span> <span class="pos" title="A word that refers to a person, place, idea, event or thing.">noun</span> <span class="guideword" title="Guide word: helps you find the right meaning when a word has more than one meaning">
+ (<span>TENNIS</span>)
+ </span></h3> <div class="sense-body">
+ <div class="def-block pad-indent" data-wl-senseid="ID_00019069_14"><p class="def-head semi-flush"><span class="def-info"><span class="freq">›</span> <span class="gram"><a href="https://dictionary.cambridge.org/zhs/help/codes.html">[<span class="gcs"> <span class="gc">U</span> </span>]</a></span></span> <b class="def">(in <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD/tennis" title="tennis">tennis</a>) the <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD/state" title="state">state</a> of having no <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD/focus" title="points">points</a>: </b></p><span class="def-body"><div class="examp emphasized"><span class="eg">The <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD/score" title="score">score</a> now <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD/stands" title="stands">stands</a> at 40–love.</span></div></span></div>
</div>
- </div><div class="cols cols--half"><div class="cols__col"><div class="xref idioms">
- <h3 class="h4 txt-block txt-block--alt"><strong class="xref-title">
- Idiom(s) </strong></h3>
-
-
- <div class="item"><a href="https://dictionary.cambridge.org/dictionary/english/be-no-little-love-lost-between" title="meaning of be no/little love lost between"><span class="x-h"><span class="phrase">be no/little love lost between</span></span></a></div>
-
- <div class="item"><a href="https://dictionary.cambridge.org/dictionary/english/for-love-nor-money" title="meaning of for love nor money"><span class="x-h"><span class="phrase">for love nor money</span></span></a></div>
-
- <div class="item"><a href="https://dictionary.cambridge.org/dictionary/english/make-love" title="meaning of make love"><span class="x-h"><span class="phrase">make love</span></span></a></div>
-
- <div class="item"><a href="https://dictionary.cambridge.org/dictionary/english/make-love-to-sb" title="meaning of make love to sb"><span class="x-h"><span class="phrase">make love to <span title="sb: abbreviation for somebody." class="obj">sb</span></span></span></a></div></div></div></div></div></div></div></div></div></div>
- </div>
-
-
- <div class="definition-src"><p><small>(Definition of “love” from the <a href='https://dictionary.cambridge.org/dictionary/english/' title='Cambridge English Dictionaries' class='a--rev'><b>Cambridge Advanced Learner's Dictionary & Thesaurus</b></a> © Cambridge University Press)</small></p></div>
+ <div class="smartt">
+ <p class="accord-basic js-accord accord-basic--shallow">词库：同义词和关联词</p>
+ <div>
+ <p>
+ <a href="https://dictionary.cambridge.org/zhs/topics/sports/tennis-and-racket-sports/" class="cdo-topic cdo-link" title="在Tennis & racket sports话题中love的同义词和相关词">Tennis & racket sports</a>
+ </p>
+ <div class="txt-block cloud rounded">
+ <div class="cdo-cloud-content">
+ <ul class="unstyled inline">
+ <li>
+ <a title="bird" class="topic_0 odd " href=" https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD/bird?topic=tennis-and-racket-sports ">
+ <span class="results"><span class="base"><b class="hw">bird</b></span></span>
+ </a>
+ </li>
+ <li>
+ <a title="birdie" class="topic_1 even " href=" https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD/birdie?topic=tennis-and-racket-sports ">
+ <span class="results"><span class="base"><b class="hw">birdie</b></span></span>
+ </a>
+ </li>
+ <li>
+ <a title="break" class="topic_3 odd " href=" https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD/break?topic=tennis-and-racket-sports ">
+ <span class="results"><span class="base"><b class="hw">break</b></span></span>
+ </a>
+ </li>
+ <li>
+ <a title="break point" class="topic_3 even " href=" https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD/break-point?topic=tennis-and-racket-sports ">
+ <span class="results"><span class="base"><b class="hw">break point</b></span></span>
+ </a>
+ </li>
+ <li>
+ <a title="deuce" class="topic_1 odd " href=" https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD/deuce?topic=tennis-and-racket-sports ">
+ <span class="results"><span class="base"><b class="hw">deuce</b></span></span>
+ </a>
+ </li>
+ <li>
+ <a title="double" class="topic_3 even " href=" https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD/double?topic=tennis-and-racket-sports ">
+ <span class="results"><span class="base"><b class="hw">double</b></span></span>
+ </a>
+ </li>
+ <li>
+ <a title="fault" class="topic_2 odd " href=" https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD/fault?topic=tennis-and-racket-sports ">
+ <span class="results"><span class="base"><b class="hw">fault</b></span></span>
+ </a>
+ </li>
+ <li>
+ <a title="foot fault" class="topic_1 even " href=" https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD/foot-fault?topic=tennis-and-racket-sports ">
+ <span class="results"><span class="base"><b class="hw">foot fault</b></span></span>
+ </a>
+ </li>
+ <li>
+ <a title="groundstroke" class="topic_0 odd " href=" https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD/groundstroke?topic=tennis-and-racket-sports ">
+ <span class="results"><span class="base"><b class="hw">groundstroke</b></span></span>
+ </a>
+ </li>
+ <li>
+ <a title="half-volley" class="topic_0 even " href=" https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD/half-volley?topic=tennis-and-racket-sports ">
+ <span class="results"><span class="base"><b class="hw">half-volley</b></span></span>
+ </a>
+ </li>
+ <li>
+ <a title="knock" class="topic_0 odd " href=" https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD/knock?topic=tennis-and-racket-sports ">
+ <span class="results"><span class="base"><b class="hw">knock</b></span></span>
+ </a>
+ </li>
+ <li>
+ <a title="lawn tennis" class="topic_1 even " href=" https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD/lawn-tennis?topic=tennis-and-racket-sports ">
+ <span class="results"><span class="base"><b class="hw">lawn tennis</b></span></span>
+ </a>
+ </li>
+ <li>
+ <a title="match point" class="topic_3 odd " href=" https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD/match-point?topic=tennis-and-racket-sports ">
+ <span class="results"><span class="base"><b class="hw">match point</b></span></span>
+ </a>
+ </li>
+ <li>
+ <a title="passing shot" class="topic_2 even " href=" https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD/passing-shot?topic=tennis-and-racket-sports ">
+ <span class="results"><span class="base"><b class="hw">passing shot</b></span></span>
+ </a>
+ </li>
+ <li>
+ <a title="racket" class="topic_1 odd " href=" https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD/racket?topic=tennis-and-racket-sports ">
+ <span class="results"><span class="base"><b class="hw">racket</b></span></span>
+ </a>
+ </li>
+ <li>
+ <a title="racquetball" class="topic_0 even " href=" https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD/racquetball?topic=tennis-and-racket-sports ">
+ <span class="results"><span class="base"><b class="hw">racquetball</b></span></span>
+ </a>
+ </li>
+ <li>
+ <a title="rally" class="topic_2 odd " href=" https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD/rally?topic=tennis-and-racket-sports ">
+ <span class="results"><span class="base"><b class="hw">rally</b></span></span>
+ </a>
+ </li>
+ <li>
+ <a title="seed" class="topic_2 even " href=" https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD/seed?topic=tennis-and-racket-sports ">
+ <span class="results"><span class="base"><b class="hw">seed</b></span></span>
+ </a>
+ </li>
+ <li>
+ <a title="single" class="topic_3 odd " href=" https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD/single?topic=tennis-and-racket-sports ">
+ <span class="results"><span class="base"><b class="hw">single</b></span></span>
+ </a>
+ </li>
+ <li>
+ <a title="smash" class="topic_2 even " href=" https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD/smash?topic=tennis-and-racket-sports ">
+ <span class="results"><span class="base"><b class="hw">smash</b></span></span>
+ </a>
+ </li>
+ </ul>
+ </div>
+ <p><a href="https://dictionary.cambridge.org/zhs/topics/sports/tennis-and-racket-sports/" title="在Tennis & racket sports话题中love的同义词和相关词"><b>查看更多结果»</b></a></p>
+ </div>
- </div>
- <div id="dataset-american-english" data-tab="ds-american-english" role="tabpanel" data-wordlist-dataset="american-english">
- <div class="resp-hide--med">
- <div class="nav-entry-mob clrd">
- <div class="nav-entry-mob__datasets dropdown dropdown--pad-a dropdown--white">
- <span class="btn btn--dropdown js-toggle" data-target-selector="#cdo-mob-datasetsamerican-english"><span id="mobEntryDictName">American</span></span>
- <div id="cdo-mob-datasetsamerican-english" class="dropdown__box rounded">
- <ul class="unstyled">
- <li><a href="#dataset-british" class="js-trigger " data-tab="ds-british" data-target-trigger="#aTabEntrybritish" data-target-updtext="#mobEntryDictName">English</a></li>
- <li><a href="#dataset-american-english" class="js-trigger on " data-tab="ds-american-english" data-target-trigger="#aTabEntryamerican-english" data-target-updtext="#mobEntryDictName">American</a></li>
- <li><a href="#dataset-example" class="js-trigger " data-tab="ds-example" data-target-trigger="#aTabEntryexample" data-target-updtext="#mobEntryDictName">Examples</a></li>
- </ul>
- </div>
- </div>
- <a href="#" class="nav-entry-mob__content-toggle txt-block txt-block--alt3 js-toggle" title="View table of contents" data-target-selector="#cdo-mob-tocamerican-english"><i class="fcdo fcdo-navicon"></i> Contents</a>
- <div id="cdo-mob-tocamerican-english" class="clr nav-entry-mob__content hide">
- <aside role="complementary">
- <div data-toc="ds-british" class="mod mod--style4 mod--flush mod-toc resp resp--med" style="display:block" >
- <div class="h3 txt-block txt-block--alt3 flush resp-show--med">Contents</div>
- <ul class="unstyled unstyled-nest accord js-accord-ul">
-<li class="section">
-<a>verb <span class="smaller">(2)</span></a><ul>
-<li><a onclick="ga('send','event', 'navigation', 'navigation-link' );" href="#british-1-1-1" title="love meaning
- "><span class="hw">love</span> <span class="alt gw">(LIKE SOMEONE)</span></a></li>
-<li><a onclick="ga('send','event', 'navigation', 'navigation-link' );" href="#british-1-1-2" title="love meaning
- "><span class="hw">love</span> <span class="alt gw">(LIKE SOMETHING)</span></a></li>
-</ul>
-</li>
-<li class="section">
-<a>noun <span class="smaller">(3)</span></a><ul>
-<li><a onclick="ga('send','event', 'navigation', 'navigation-link' );" href="#british-1-2-1" title="love meaning
- "><span class="hw">love</span> <span class="alt gw">(LIKING SOMEONE)</span></a></li>
-<li><a onclick="ga('send','event', 'navigation', 'navigation-link' );" href="#british-1-2-2" title="love meaning
- "><span class="hw">love</span> <span class="alt gw">(LIKING SOMETHING)</span></a></li>
-<li><a onclick="ga('send','event', 'navigation', 'navigation-link' );" href="#british-1-2-3" title="love meaning
- "><span class="hw">love</span> <span class="alt gw">(TENNIS)</span></a></li>
-</ul>
-</li>
-</ul>
- </div>
- <div data-toc="ds-american-english" class="mod mod--style4 mod--flush mod-toc resp resp--med" style="display:none">
- <div class="h3 txt-block txt-block--alt3 flush resp-show--med">Contents</div>
- <ul class="unstyled unstyled-nest accord js-accord-ul">
+ </div>
+ </div>
+ </div><div class="cols cols--half"><div class="cols__col"><div class="xref idioms"><h3 class="h4 txt-block txt-block--alt"><strong class="xref-title">
+ 习惯用语 </strong></h3>
+
+ <div class="item"><a href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD/be-no-little-love-lost-between" title="be no/little love lost between的意思"><span class="x-h"><b class="phrase">be no/little love lost between</b></span></a></div>
+
+ <div class="item"><a href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD/for-love-nor-money" title="for love nor money的意思"><span class="x-h"><b class="phrase">for love nor money</b></span></a></div>
+
+ <div class="item"><a href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD/make-love" title="make love的意思"><span class="x-h"><b class="phrase">make love</b></span></a></div>
+
+ <div class="item"><a href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD/make-love-to-sb" title="make love to sb的意思"><span class="x-h"><b class="phrase">make love to <i class="obj">sb</i></b></span></a></div></div></div></div></div></div></div></div></div><div class="definition-src"><p><small>
+ (love在<a href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD/" title="剑桥高级学习词典和同义词词典" class="a--rev"><b>剑桥高级学习词典和同义词词典</b></a>的解释 © Cambridge University Press)
+ </small></p></div></div></div></div><div class="dictionary" data-type="sorted" data-id="cacd" id="dataset-cacd" data-tab="ds-cacd" role="tabpanel"> <div class="resp-hide--med">
+ <div class="nav-entry-mob clrd">
+ <div class="nav-entry-mob__datasets dropdown dropdown--pad-a dropdown--white">
+ <span class="btn btn--dropdown js-toggle" data-target-selector="#cdo-mob-datasetscacd"><span id="mobEntryDictName">美式</span></span>
+ <div id="cdo-mob-datasetscacd" class="dropdown__box rounded">
+ <ul class="unstyled">
+ <li><a href="#dataset-cald4" class="js-trigger " data-tab="ds-cald4" data-target-trigger="#aTabEntrycald4" data-target-updtext="#mobEntryDictName">英语</a></li>
+ <li><a href="#dataset-cacd" class="js-trigger on " data-tab="ds-cacd" data-target-trigger="#aTabEntrycacd" data-target-updtext="#mobEntryDictName">美式</a></li>
+ <li><a href="#dataset-examples" class="js-trigger " data-tab="ds-examples" data-target-trigger="#aTabEntryexamples" data-target-updtext="#mobEntryDictName">例句</a></li>
+ </ul>
+ </div>
+ </div>
+ <div> <a href="#" class="nav-entry-mob__content-toggle txt-block txt-block--alt3 js-toggle resp-hide--med" title="View table of contents" data-target-selector="#cdo-mob-toc-cacd"><i class="fcdo fcdo-navicon"> </i> Contents</a> <div id="cdo-mob-toc-cacd" class=" clr nav-entry-mob__content hide resp-hide--med "><aside role="complementary"><div data-toc="ds-english" class="mod mod--style4 mod--flush mod-toc">
+<div class="h3 txt-block txt-block--alt3 flush resp-show--med">内容</div>
+<ul class="unstyled unstyled-nest accord js-accord-ul">
<li class="section">
<a>verb <span class="smaller">(2)</span></a><ul>
-<li><a onclick="ga('send','event', 'navigation', 'navigation-link' );" href="#american-english-1-1-1" title="love meaning
+<li><a onclick="ga('send','event', 'navigation', 'navigation-link' );" href="#cacd-1-1-1" title="love 意思
"><span class="hw">love</span> <span class="alt gw">(LIKE SOMEONE)</span></a></li>
-<li><a onclick="ga('send','event', 'navigation', 'navigation-link' );" href="#american-english-1-1-2" title="love meaning
+<li><a onclick="ga('send','event', 'navigation', 'navigation-link' );" href="#cacd-1-1-2" title="love 意思
"><span class="hw">love</span> <span class="alt gw">(LIKE SOMETHING)</span></a></li>
</ul>
</li>
<li class="section">
-<a>noun <span class="smaller">(1)</span></a><ul><li><a onclick="ga('send','event', 'navigation', 'navigation-link' );" href="#american-english-1-2-1" title="love meaning
+<a>noun <span class="smaller">(1)</span></a><ul><li><a onclick="ga('send','event', 'navigation', 'navigation-link' );" href="#cacd-1-2-1" title="love 意思
"><span class="hw">love</span> <span class="alt gw">(LIKING SOMEONE)</span></a></li></ul>
</li>
</ul>
- </div>
- </aside> </div>
- </div>
- </div>
- <div class="entry-nav tabs__tabs js-tabs resp resp--med">
- <!-- NOTE: Tabs count added as a data attribute, can be added via js if required and used to size correctly -->
- <ul data-tabs-count=4 role="tablist">
- <li role="presentation">
- <a href="#dataset-british" id="aTabEntrybritish" class="js-trigger " data-tab="ds-british" role="tab" aria-selected="true" data-target-updtext="#mobEntryDictName">English</a>
- </li>
- <li role="presentation">
- <a href="#dataset-american-english" id="aTabEntryamerican-english" class="js-trigger on " data-tab="ds-american-english" role="tab" aria-selected="true" data-target-updtext="#mobEntryDictName">American</a>
- </li>
-
- <li role="presentation">
- <a href="#dataset-example" id="aTabEntryexample" data-tab="ds-example" class="js-trigger " role="tab" aria-selected="true" data-target-updtext="#mobEntryDictName">Examples</a>
- </li>
- </ul>
- </div>
-
- <div class="cdo-dblclick-area">
- <div class="di superentry" itemprop="text">
- <div class="di-head"><div class="di-title">
- <h2 class="hw" title="what is “love”?">
- "love" in American English
- </h2>
- </div>
+</div></aside></div> </div>
+ </div>
+ </div>
+ <div class="entry-nav tabs__tabs js-tabs resp resp--med">
+ <ul role="tablist" data-tabs-count="3">
+ <li role="presentation">
+ <a href="#dataset-cald4" id="aTabEntrycald4" class="js-trigger " data-tab="ds-cald4" role="tab" aria-selected="true" data-target-updtext="#mobEntryDictName">英语</a>
+ </li>
+ <li role="presentation">
+ <a href="#dataset-cacd" id="aTabEntrycacd" class="js-trigger on " data-tab="ds-cacd" role="tab" aria-selected="true" data-target-updtext="#mobEntryDictName">美式</a>
+ </li>
+ <li role="presentation">
+ <a href="#dataset-examples" id="aTabEntryexamples" class="js-trigger " data-tab="ds-examples" role="tab" aria-selected="true" data-target-updtext="#mobEntryDictName">例句</a>
+ </li>
+ </ul>
+ </div>
+ <div class="link"><div class="di superentry" itemprop="text">
+ <div class="di-head"><div class="di-title">
+ <h2 class="hw" title="什么是“love”?">
+ “love”在美式英语词典中的解释及翻译
+ </h2>
+ </div>
- <a href="https://dictionary.cambridge.org/dictionary/english/love#translations" class="see-all-translations a--rev"><i class="fcdo fcdo-caret-right" aria-hidden="true"> </i><b>See all translations</b></a>
+ <a href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD/love#translations" class="see-all-translations a--rev"><i class="fcdo fcdo-caret-right" aria-hidden="true"> </i><b>查看所有翻译</b></a>
- </div>
- <div class="di-body"><div class="entry"><div class="entry-body"> <div class="entry-body__el clrd js-share-holder"><div class="pos-header">
- <div class="h3 di-title cdo-section-title-hw"><span class="headword"><span class="hw">love</span></span>
+ </div>
+ <div class="di-body"><div class="entry"><div class="entry-body"> <div class="entry-body__el clrd js-share-holder"><div class="pos-header"><div class="h3 di-title cdo-section-title-hw"><span class="headword"><span class="hw">love</span></span>
<span class="posgram ico-bg"><span class="pos" title="A word that describes an action, condition or experience.">verb</span></span>
</div>
- <span class="pron-info"><span class="us"><span class="region">us</span>
- <span title="love: listen to American pronunciation" data-src-mp3="https://dictionary.cambridge.org/media/english/us_pron/l/lov/love_/love.mp3" data-src-ogg="https://dictionary.cambridge.org/media/english/us_pron_ogg/l/lov/love_/love.ogg" class="circle circle-btn sound audio_play_button us">
+ <span class="us"><span class="region">us</span>
+ <span title="love: listen to American pronunciation" data-src-mp3="/zhs/media/%E8%8B%B1%E8%AF%AD/us_pron/l/lov/love_/love.mp3" data-src-ogg="/zhs/media/%E8%8B%B1%E8%AF%AD/us_pron_ogg/l/lov/love_/love.ogg" class="circle circle-btn sound audio_play_button">
<i class='fcdo fcdo-volume-up'>​</i>
</span>
- </span>
- <span class="uk"><span class="pron">/<span class="ipa">lʌv</span>/</span></span>
- </span>
+ <span class="pron">/<span class="ipa">lʌv</span>/</span> </span>
<div class="share rounded js-share">
<span class="point"></span>
- <a class="circle bg--fb socialShareLink" title="Share this entry on Facebook" href='https://www.facebook.com/sharer.php?u=https%3A%2F%2Fdictionary.cambridge.org%2Fdictionary%2Fenglish%2Flove&t=love+Meaning+in+the+Cambridge+English+Dictionary' target='_blank' data-social='facebook' data-url='https://www.facebook.com/sharer.php?u=https%3A%2F%2Fdictionary.cambridge.org%2Fdictionary%2Fenglish%2Flove&t=love+Meaning+in+the+Cambridge+English+Dictionary' data-object='entry'>
+ <a class="circle bg--fb socialShareLink" title="在Facebook上分享该词条" href='https://www.facebook.com/sharer.php?u=https%3A%2F%2Fdictionary.cambridge.org%2Fzhs%2F%25E8%25AF%258D%25E5%2585%25B8%2F%25E8%258B%25B1%25E8%25AF%25AD%2Flove&t=LOVE%E5%9C%A8%E5%89%91%E6%A1%A5%E8%8B%B1%E8%AF%AD%E8%AF%8D%E5%85%B8%E4%B8%AD%E7%9A%84%E8%A7%A3%E9%87%8A%E5%8F%8A%E7%BF%BB%E8%AF%91' target='_blank' data-social='facebook' data-url='https://www.facebook.com/sharer.php?u=https%3A%2F%2Fdictionary.cambridge.org%2Fzhs%2F%25E8%25AF%258D%25E5%2585%25B8%2F%25E8%258B%25B1%25E8%25AF%25AD%2Flove&t=LOVE%E5%9C%A8%E5%89%91%E6%A1%A5%E8%8B%B1%E8%AF%AD%E8%AF%8D%E5%85%B8%E4%B8%AD%E7%9A%84%E8%A7%A3%E9%87%8A%E5%8F%8A%E7%BF%BB%E8%AF%91' data-object='entry'>
<i class="fcdo fcdo-facebook" aria-hidden="true"></i>
</a>
- <a class="circle bg--tw socialShareLink" title="Tweet this entry" href='https://twitter.com/intent/tweet?url=https%3A%2F%2Fdictionary.cambridge.org%2Fdictionary%2Fenglish%2Flove&text=love+Meaning+in+the+Cambridge+English+Dictionary' target='_blank' data-social='twitter' data-url='https://twitter.com/intent/tweet?url=https%3A%2F%2Fdictionary.cambridge.org%2Fdictionary%2Fenglish%2Flove&text=love+Meaning+in+the+Cambridge+English+Dictionary' data-object='entry'>
+ <a class="circle bg--tw socialShareLink" title="用推特发送该页面" href='https://twitter.com/intent/tweet?url=https%3A%2F%2Fdictionary.cambridge.org%2Fzhs%2F%25E8%25AF%258D%25E5%2585%25B8%2F%25E8%258B%25B1%25E8%25AF%25AD%2Flove&text=LOVE%E5%9C%A8%E5%89%91%E6%A1%A5%E8%8B%B1%E8%AF%AD%E8%AF%8D%E5%85%B8%E4%B8%AD%E7%9A%84%E8%A7%A3%E9%87%8A%E5%8F%8A%E7%BF%BB%E8%AF%91' target='_blank' data-social='twitter' data-url='https://twitter.com/intent/tweet?url=https%3A%2F%2Fdictionary.cambridge.org%2Fzhs%2F%25E8%25AF%258D%25E5%2585%25B8%2F%25E8%258B%25B1%25E8%25AF%25AD%2Flove&text=LOVE%E5%9C%A8%E5%89%91%E6%A1%A5%E8%8B%B1%E8%AF%AD%E8%AF%8D%E5%85%B8%E4%B8%AD%E7%9A%84%E8%A7%A3%E9%87%8A%E5%8F%8A%E7%BF%BB%E8%AF%91' data-object='entry'>
<i class="fcdo fcdo-twitter" aria-hidden="true"></i>
</a>
- <a class="circle bg--more js-accord" title="More" href="#" >
+ <a class="circle bg--more js-accord" title="更多" href="#" >
<i class="fcdo fcdo-plus"></i>
<i class="fcdo fcdo-minus"></i>
</a>
<div class="oflow-hide js-share-toggle">
- <a class="circle bg--gp socialShareLink" title="Share this entry on Google+" href='https://plus.google.com/share?url=https%3A%2F%2Fdictionary.cambridge.org%2Fdictionary%2Fenglish%2Flove' target='_blank' data-social='google' data-url='https://plus.google.com/share?url=https%3A%2F%2Fdictionary.cambridge.org%2Fdictionary%2Fenglish%2Flove' data-object='entry'>
+ <a class="circle bg--gp socialShareLink" title="在Google+上分享该词条" href='https://plus.google.com/share?url=https%3A%2F%2Fdictionary.cambridge.org%2Fzhs%2F%25E8%25AF%258D%25E5%2585%25B8%2F%25E8%258B%25B1%25E8%25AF%25AD%2Flove' target='_blank' data-social='google' data-url='https://plus.google.com/share?url=https%3A%2F%2Fdictionary.cambridge.org%2Fzhs%2F%25E8%25AF%258D%25E5%2585%25B8%2F%25E8%258B%25B1%25E8%25AF%25AD%2Flove' data-object='entry'>
<i class="fcdo fcdo-google-plus" aria-hidden="true"></i>
</a>
- <a class="circle bg--di socialShareLink" title="Share this entry on Diigo" href='https://www.diigo.com/post?url=https%3A%2F%2Fdictionary.cambridge.org%2Fdictionary%2Fenglish%2Flove&title=love+Meaning+in+the+Cambridge+English+Dictionary' target='_blank' data-social='diigo' data-url='https://www.diigo.com/post?url=https%3A%2F%2Fdictionary.cambridge.org%2Fdictionary%2Fenglish%2Flove&title=love+Meaning+in+the+Cambridge+English+Dictionary' data-object='entry'>
+ <a class="circle bg--di socialShareLink" title="在Diigo上分享该词条" href='https://www.diigo.com/post?url=https%3A%2F%2Fdictionary.cambridge.org%2Fzhs%2F%25E8%25AF%258D%25E5%2585%25B8%2F%25E8%258B%25B1%25E8%25AF%25AD%2Flove&title=LOVE%E5%9C%A8%E5%89%91%E6%A1%A5%E8%8B%B1%E8%AF%AD%E8%AF%8D%E5%85%B8%E4%B8%AD%E7%9A%84%E8%A7%A3%E9%87%8A%E5%8F%8A%E7%BF%BB%E8%AF%91' target='_blank' data-social='diigo' data-url='https://www.diigo.com/post?url=https%3A%2F%2Fdictionary.cambridge.org%2Fzhs%2F%25E8%25AF%258D%25E5%2585%25B8%2F%25E8%258B%25B1%25E8%25AF%25AD%2Flove&title=LOVE%E5%9C%A8%E5%89%91%E6%A1%A5%E8%8B%B1%E8%AF%AD%E8%AF%8D%E5%85%B8%E4%B8%AD%E7%9A%84%E8%A7%A3%E9%87%8A%E5%8F%8A%E7%BF%BB%E8%AF%91' data-object='entry'>
<i class="fcdo fcdo-diigo" aria-hidden="true"></i>
</a>
- <a class="circle bg--su socialShareLink" title="Share this entry on StumbleUpon" href='https://www.stumbleupon.com/likecontent?url=https%3A%2F%2Fdictionary.cambridge.org%2Fdictionary%2Fenglish%2Flove&title=love+Meaning+in+the+Cambridge+English+Dictionary' target='_blank' data-social='stumbleupon' data-url='https://www.stumbleupon.com/likecontent?url=https%3A%2F%2Fdictionary.cambridge.org%2Fdictionary%2Fenglish%2Flove&title=love+Meaning+in+the+Cambridge+English+Dictionary' data-object='entry'>
- <i class="fcdo fcdo-stumbleupon" aria-hidden="true"></i>
- </a>
- <a class="circle bg--tu socialShareLink" title="Share this entry on Tumblr" href='https://www.tumblr.com/share/link?url=https%3A%2F%2Fdictionary.cambridge.org%2Fdictionary%2Fenglish%2Flove&name=love+Meaning+in+the+Cambridge+English+Dictionary' target='_blank' data-social='tumblr' data-url='https://www.tumblr.com/share/link?url=https%3A%2F%2Fdictionary.cambridge.org%2Fdictionary%2Fenglish%2Flove&name=love+Meaning+in+the+Cambridge+English+Dictionary' data-object='entry'>
+ <a class="circle bg--tu socialShareLink" title="在Tumblr上分享该词条" href='https://www.tumblr.com/share/link?url=https%3A%2F%2Fdictionary.cambridge.org%2Fzhs%2F%25E8%25AF%258D%25E5%2585%25B8%2F%25E8%258B%25B1%25E8%25AF%25AD%2Flove&name=LOVE%E5%9C%A8%E5%89%91%E6%A1%A5%E8%8B%B1%E8%AF%AD%E8%AF%8D%E5%85%B8%E4%B8%AD%E7%9A%84%E8%A7%A3%E9%87%8A%E5%8F%8A%E7%BF%BB%E8%AF%91' target='_blank' data-social='tumblr' data-url='https://www.tumblr.com/share/link?url=https%3A%2F%2Fdictionary.cambridge.org%2Fzhs%2F%25E8%25AF%258D%25E5%2585%25B8%2F%25E8%258B%25B1%25E8%25AF%25AD%2Flove&name=LOVE%E5%9C%A8%E5%89%91%E6%A1%A5%E8%8B%B1%E8%AF%AD%E8%AF%8D%E5%85%B8%E4%B8%AD%E7%9A%84%E8%A7%A3%E9%87%8A%E5%8F%8A%E7%BF%BB%E8%AF%91' data-object='entry'>
<i class="fcdo fcdo-tumblr" aria-hidden="true"></i>
</a>
- <a class="circle bg--re socialShareLink" title="Share this entry on Reddit" href='https://www.reddit.com/submit?url=https%3A%2F%2Fdictionary.cambridge.org%2Fdictionary%2Fenglish%2Flove&title=love+Meaning+in+the+Cambridge+English+Dictionary' target='_blank' data-social='reddit' data-url='https://www.reddit.com/submit?url=https%3A%2F%2Fdictionary.cambridge.org%2Fdictionary%2Fenglish%2Flove&title=love+Meaning+in+the+Cambridge+English+Dictionary' data-object='entry'>
+ <a class="circle bg--re socialShareLink" title="在Reddit上分享该词条" href='https://www.reddit.com/submit?url=https%3A%2F%2Fdictionary.cambridge.org%2Fzhs%2F%25E8%25AF%258D%25E5%2585%25B8%2F%25E8%258B%25B1%25E8%25AF%25AD%2Flove&title=LOVE%E5%9C%A8%E5%89%91%E6%A1%A5%E8%8B%B1%E8%AF%AD%E8%AF%8D%E5%85%B8%E4%B8%AD%E7%9A%84%E8%A7%A3%E9%87%8A%E5%8F%8A%E7%BF%BB%E8%AF%91' target='_blank' data-social='reddit' data-url='https://www.reddit.com/submit?url=https%3A%2F%2Fdictionary.cambridge.org%2Fzhs%2F%25E8%25AF%258D%25E5%2585%25B8%2F%25E8%258B%25B1%25E8%25AF%25AD%2Flove&title=LOVE%E5%9C%A8%E5%89%91%E6%A1%A5%E8%8B%B1%E8%AF%AD%E8%AF%8D%E5%85%B8%E4%B8%AD%E7%9A%84%E8%A7%A3%E9%87%8A%E5%8F%8A%E7%BF%BB%E8%AF%91' data-object='entry'>
<i class="fcdo fcdo-reddit-alien" aria-hidden="true"></i>
</a>
- <a class="circle bg--def socialShareLink" title="Share this url" dsp-txt='https://dictionary.cambridge.org/dictionary/english/love' data-social='url' data-url='https://dictionary.cambridge.org/dictionary/english/love' data-object='entry'>
+ <a class="circle bg--def socialShareLink" title="分享这个链接" dsp-txt='https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD/love' data-social='url' data-url='https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD/love' data-object='entry'>
<i class="fcdo fcdo-link" aria-hidden="true"></i>
</a>
</div>
</div>
</div><div class="pos-body">
- <div class="sense-block" id="american-english-1-1-1">
-
- <h3 class="txt-block txt-block--alt2"><span class="hw">love</span> <span class="pos" title="A word that describes an action, condition or experience.">verb</span> <span class="guideword" title="Guide word: helps you find the right meaning when a word has more than one meaning">
+ <div class="sense-block" id="cacd-1-1-1"> <h3 class="txt-block txt-block--alt2"><span class="hw">love</span> <span class="pos" title="A word that describes an action, condition or experience.">verb</span> <span class="guideword" title="Guide word: helps you find the right meaning when a word has more than one meaning">
(<span>LIKE SOMEONE</span>)
- </span></h3>
- <div class="sense-body">
- <div class="def-block pad-indent" data-wl-senseid="ID_00010529_01"><p class="def-head semi-flush"><span class="def-info"><span class="freq">›</span> <span class="gram"><a href="https://dictionary.cambridge.org/help/codes.html">[<span class="gcs"> <span title="Transitive verb: a verb that has an object." class="gc">T</span> </span>]</a></span></span> <b class="def">to have a <a class="query" href="https://dictionary.cambridge.org/dictionary/english/strong" title="strong">strong</a> <a class="query" href="https://dictionary.cambridge.org/dictionary/english/affection" title="affection">affection</a> for someone, which can be <a class="query" href="https://dictionary.cambridge.org/dictionary/english/combine" title="combined">combined</a> with a <a class="query" href="https://dictionary.cambridge.org/dictionary/english/strong" title="strong">strong</a> <a class="query" href="https://dictionary.cambridge.org/dictionary/english/romantic" title="romantic">romantic</a> <a class="query" href="https://dictionary.cambridge.org/dictionary/english/attraction" title="attraction">attraction</a>: </b></p><span class="def-body"><div class="examp emphasized"><span title="Example" class="eg">Susan loved her <a class="query" href="https://dictionary.cambridge.org/dictionary/english/brother" title="brother">brother</a> <a class="query" href="https://dictionary.cambridge.org/dictionary/english/dearly" title="dearly">dearly</a>.</span></div><div class="examp emphasized"> <span title="Example" class="eg">"I love you and <a class="query" href="https://dictionary.cambridge.org/dictionary/english/want" title="want">want</a> to <a class="query" href="https://dictionary.cambridge.org/dictionary/english/marry" title="marry">marry</a> you, Emily," he said.</span></div></span></div>
- </div> </div>
-
- <div class="sense-block" id="american-english-1-1-2">
+ </span></h3> <div class="sense-body">
+ <div class="def-block pad-indent" data-wl-senseid="CACD_00010529_01"><p class="def-head semi-flush"><span class="def-info"><span class="freq">›</span> <span class="gram"><a href="https://dictionary.cambridge.org/zhs/help/codes.html">[<span class="gcs"> <span class="gc">T</span> </span>]</a></span></span> <b class="def">to have a <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD/strong" title="strong">strong</a> <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD/affection" title="affection">affection</a> for someone, which can be <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD/combined" title="combined">combined</a> with a <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD/strong" title="strong">strong</a> <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD/romantic" title="romantic">romantic</a> <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD/attraction" title="attraction">attraction</a>: </b></p><span class="def-body"><div class="examp emphasized"><span class="eg">Susan loved her <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD/brother" title="brother">brother</a> <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD/dearly" title="dearly">dearly</a>.</span></div><div class="examp emphasized"> <span class="eg">"I love you and <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD/want" title="want">want</a> to <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD/marry" title="marry">marry</a> you, Emily," he said.</span></div></span></div>
+ </div> </div>
- <h3 class="txt-block txt-block--alt2"><span class="hw">love</span> <span class="pos" title="A word that describes an action, condition or experience.">verb</span> <span class="guideword" title="Guide word: helps you find the right meaning when a word has more than one meaning">
+ <div class="sense-block" id="cacd-1-1-2"> <h3 class="txt-block txt-block--alt2"><span class="hw">love</span> <span class="pos" title="A word that describes an action, condition or experience.">verb</span> <span class="guideword" title="Guide word: helps you find the right meaning when a word has more than one meaning">
(<span>LIKE SOMETHING</span>)
- </span></h3>
- <div class="sense-body">
- <div class="def-block pad-indent" data-wl-senseid="ID_00010529_02"><p class="def-head semi-flush"><span class="def-info"><span class="freq">›</span> </span><b class="def">to like something very much: </b></p><span class="def-body"><div class="examp emphasized"><span class="gram"><a href="https://dictionary.cambridge.org/help/codes.html">[<span class="gcs"> <span title="Transitive verb: a verb that has an object." class="gc">T</span> </span>]</a></span> <span title="Example" class="eg">My <a class="query" href="https://dictionary.cambridge.org/dictionary/english/kid" title="kids">kids</a> love <a class="query" href="https://dictionary.cambridge.org/dictionary/english/cartoon" title="cartoons">cartoons</a>.</span></div><div class="examp emphasized"> <span class="gram"><a href="https://dictionary.cambridge.org/help/codes.html">[<span class="gcs"> <span title="Followed by 'to' and a verb in the infinitive." class="gc">+ to infinitive</span> </span>]</a></span> <span title="Example" class="eg">We’d love to own <a class="query" href="https://dictionary.cambridge.org/dictionary/english/our" title="our">our</a> own <a class="query" href="https://dictionary.cambridge.org/dictionary/english/home" title="home">home</a>.</span></div></span></div>
- </div> </div></div></div> <div class="entry-body__el clrd js-share-holder"><div class="pos-header">
- <div class="h3 di-title cdo-section-title-hw"><span class="headword"><span class="hw">love</span></span>
+ </span></h3> <div class="sense-body">
+ <div class="def-block pad-indent" data-wl-senseid="CACD_00010529_02"><p class="def-head semi-flush"><span class="def-info"><span class="freq">›</span> </span><b class="def">to like something very much: </b></p><span class="def-body"><div class="examp emphasized"><span class="gram"><a href="https://dictionary.cambridge.org/zhs/help/codes.html">[<span class="gcs"> <span class="gc">T</span> </span>]</a></span> <span class="eg">My <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD/kid" title="kids">kids</a> love <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD/cartoon" title="cartoons">cartoons</a>.</span></div><div class="examp emphasized"> <span class="gram"><a href="https://dictionary.cambridge.org/zhs/help/codes.html">[<span class="gcs"> <span class="gc">+ to infinitive</span> </span>]</a></span> <span class="eg">We’d love to own <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD/our" title="our">our</a> own <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD/home" title="home">home</a>.</span></div></span></div>
+ </div> </div></div></div> <div class="entry-body__el clrd js-share-holder"><div class="pos-header"><div class="h3 di-title cdo-section-title-hw"><span class="headword"><span class="hw">love</span></span>
<span class="posgram ico-bg"><span class="pos" title="A word that refers to a person, place, idea, event or thing.">noun</span></span>
</div>
- <span class="pron-info"><span class="us"><span class="region">us</span>
- <span title="love: listen to American pronunciation" data-src-mp3="https://dictionary.cambridge.org/media/english/us_pron/l/lov/love_/love.mp3" data-src-ogg="https://dictionary.cambridge.org/media/english/us_pron_ogg/l/lov/love_/love.ogg" class="circle circle-btn sound audio_play_button us">
+ <span class="us"><span class="region">us</span>
+ <span title="love: listen to American pronunciation" data-src-mp3="/zhs/media/%E8%8B%B1%E8%AF%AD/us_pron/l/lov/love_/love.mp3" data-src-ogg="/zhs/media/%E8%8B%B1%E8%AF%AD/us_pron_ogg/l/lov/love_/love.ogg" class="circle circle-btn sound audio_play_button">
<i class='fcdo fcdo-volume-up'>​</i>
</span>
- </span>
- <span class="uk"><span class="pron">/<span class="ipa">lʌv</span>/</span></span>
- </span>
+ <span class="pron">/<span class="ipa">lʌv</span>/</span> </span>
<div class="share rounded js-share">
<span class="point"></span>
- <a class="circle bg--fb socialShareLink" title="Share this entry on Facebook" href='https://www.facebook.com/sharer.php?u=https%3A%2F%2Fdictionary.cambridge.org%2Fdictionary%2Fenglish%2Flove&t=love+Meaning+in+the+Cambridge+English+Dictionary' target='_blank' data-social='facebook' data-url='https://www.facebook.com/sharer.php?u=https%3A%2F%2Fdictionary.cambridge.org%2Fdictionary%2Fenglish%2Flove&t=love+Meaning+in+the+Cambridge+English+Dictionary' data-object='entry'>
+ <a class="circle bg--fb socialShareLink" title="在Facebook上分享该词条" href='https://www.facebook.com/sharer.php?u=https%3A%2F%2Fdictionary.cambridge.org%2Fzhs%2F%25E8%25AF%258D%25E5%2585%25B8%2F%25E8%258B%25B1%25E8%25AF%25AD%2Flove&t=LOVE%E5%9C%A8%E5%89%91%E6%A1%A5%E8%8B%B1%E8%AF%AD%E8%AF%8D%E5%85%B8%E4%B8%AD%E7%9A%84%E8%A7%A3%E9%87%8A%E5%8F%8A%E7%BF%BB%E8%AF%91' target='_blank' data-social='facebook' data-url='https://www.facebook.com/sharer.php?u=https%3A%2F%2Fdictionary.cambridge.org%2Fzhs%2F%25E8%25AF%258D%25E5%2585%25B8%2F%25E8%258B%25B1%25E8%25AF%25AD%2Flove&t=LOVE%E5%9C%A8%E5%89%91%E6%A1%A5%E8%8B%B1%E8%AF%AD%E8%AF%8D%E5%85%B8%E4%B8%AD%E7%9A%84%E8%A7%A3%E9%87%8A%E5%8F%8A%E7%BF%BB%E8%AF%91' data-object='entry'>
<i class="fcdo fcdo-facebook" aria-hidden="true"></i>
</a>
- <a class="circle bg--tw socialShareLink" title="Tweet this entry" href='https://twitter.com/intent/tweet?url=https%3A%2F%2Fdictionary.cambridge.org%2Fdictionary%2Fenglish%2Flove&text=love+Meaning+in+the+Cambridge+English+Dictionary' target='_blank' data-social='twitter' data-url='https://twitter.com/intent/tweet?url=https%3A%2F%2Fdictionary.cambridge.org%2Fdictionary%2Fenglish%2Flove&text=love+Meaning+in+the+Cambridge+English+Dictionary' data-object='entry'>
+ <a class="circle bg--tw socialShareLink" title="用推特发送该页面" href='https://twitter.com/intent/tweet?url=https%3A%2F%2Fdictionary.cambridge.org%2Fzhs%2F%25E8%25AF%258D%25E5%2585%25B8%2F%25E8%258B%25B1%25E8%25AF%25AD%2Flove&text=LOVE%E5%9C%A8%E5%89%91%E6%A1%A5%E8%8B%B1%E8%AF%AD%E8%AF%8D%E5%85%B8%E4%B8%AD%E7%9A%84%E8%A7%A3%E9%87%8A%E5%8F%8A%E7%BF%BB%E8%AF%91' target='_blank' data-social='twitter' data-url='https://twitter.com/intent/tweet?url=https%3A%2F%2Fdictionary.cambridge.org%2Fzhs%2F%25E8%25AF%258D%25E5%2585%25B8%2F%25E8%258B%25B1%25E8%25AF%25AD%2Flove&text=LOVE%E5%9C%A8%E5%89%91%E6%A1%A5%E8%8B%B1%E8%AF%AD%E8%AF%8D%E5%85%B8%E4%B8%AD%E7%9A%84%E8%A7%A3%E9%87%8A%E5%8F%8A%E7%BF%BB%E8%AF%91' data-object='entry'>
<i class="fcdo fcdo-twitter" aria-hidden="true"></i>
</a>
- <a class="circle bg--more js-accord" title="More" href="#" >
+ <a class="circle bg--more js-accord" title="更多" href="#" >
<i class="fcdo fcdo-plus"></i>
<i class="fcdo fcdo-minus"></i>
</a>
<div class="oflow-hide js-share-toggle">
- <a class="circle bg--gp socialShareLink" title="Share this entry on Google+" href='https://plus.google.com/share?url=https%3A%2F%2Fdictionary.cambridge.org%2Fdictionary%2Fenglish%2Flove' target='_blank' data-social='google' data-url='https://plus.google.com/share?url=https%3A%2F%2Fdictionary.cambridge.org%2Fdictionary%2Fenglish%2Flove' data-object='entry'>
+ <a class="circle bg--gp socialShareLink" title="在Google+上分享该词条" href='https://plus.google.com/share?url=https%3A%2F%2Fdictionary.cambridge.org%2Fzhs%2F%25E8%25AF%258D%25E5%2585%25B8%2F%25E8%258B%25B1%25E8%25AF%25AD%2Flove' target='_blank' data-social='google' data-url='https://plus.google.com/share?url=https%3A%2F%2Fdictionary.cambridge.org%2Fzhs%2F%25E8%25AF%258D%25E5%2585%25B8%2F%25E8%258B%25B1%25E8%25AF%25AD%2Flove' data-object='entry'>
<i class="fcdo fcdo-google-plus" aria-hidden="true"></i>
</a>
- <a class="circle bg--di socialShareLink" title="Share this entry on Diigo" href='https://www.diigo.com/post?url=https%3A%2F%2Fdictionary.cambridge.org%2Fdictionary%2Fenglish%2Flove&title=love+Meaning+in+the+Cambridge+English+Dictionary' target='_blank' data-social='diigo' data-url='https://www.diigo.com/post?url=https%3A%2F%2Fdictionary.cambridge.org%2Fdictionary%2Fenglish%2Flove&title=love+Meaning+in+the+Cambridge+English+Dictionary' data-object='entry'>
+ <a class="circle bg--di socialShareLink" title="在Diigo上分享该词条" href='https://www.diigo.com/post?url=https%3A%2F%2Fdictionary.cambridge.org%2Fzhs%2F%25E8%25AF%258D%25E5%2585%25B8%2F%25E8%258B%25B1%25E8%25AF%25AD%2Flove&title=LOVE%E5%9C%A8%E5%89%91%E6%A1%A5%E8%8B%B1%E8%AF%AD%E8%AF%8D%E5%85%B8%E4%B8%AD%E7%9A%84%E8%A7%A3%E9%87%8A%E5%8F%8A%E7%BF%BB%E8%AF%91' target='_blank' data-social='diigo' data-url='https://www.diigo.com/post?url=https%3A%2F%2Fdictionary.cambridge.org%2Fzhs%2F%25E8%25AF%258D%25E5%2585%25B8%2F%25E8%258B%25B1%25E8%25AF%25AD%2Flove&title=LOVE%E5%9C%A8%E5%89%91%E6%A1%A5%E8%8B%B1%E8%AF%AD%E8%AF%8D%E5%85%B8%E4%B8%AD%E7%9A%84%E8%A7%A3%E9%87%8A%E5%8F%8A%E7%BF%BB%E8%AF%91' data-object='entry'>
<i class="fcdo fcdo-diigo" aria-hidden="true"></i>
</a>
- <a class="circle bg--su socialShareLink" title="Share this entry on StumbleUpon" href='https://www.stumbleupon.com/likecontent?url=https%3A%2F%2Fdictionary.cambridge.org%2Fdictionary%2Fenglish%2Flove&title=love+Meaning+in+the+Cambridge+English+Dictionary' target='_blank' data-social='stumbleupon' data-url='https://www.stumbleupon.com/likecontent?url=https%3A%2F%2Fdictionary.cambridge.org%2Fdictionary%2Fenglish%2Flove&title=love+Meaning+in+the+Cambridge+English+Dictionary' data-object='entry'>
- <i class="fcdo fcdo-stumbleupon" aria-hidden="true"></i>
- </a>
- <a class="circle bg--tu socialShareLink" title="Share this entry on Tumblr" href='https://www.tumblr.com/share/link?url=https%3A%2F%2Fdictionary.cambridge.org%2Fdictionary%2Fenglish%2Flove&name=love+Meaning+in+the+Cambridge+English+Dictionary' target='_blank' data-social='tumblr' data-url='https://www.tumblr.com/share/link?url=https%3A%2F%2Fdictionary.cambridge.org%2Fdictionary%2Fenglish%2Flove&name=love+Meaning+in+the+Cambridge+English+Dictionary' data-object='entry'>
+ <a class="circle bg--tu socialShareLink" title="在Tumblr上分享该词条" href='https://www.tumblr.com/share/link?url=https%3A%2F%2Fdictionary.cambridge.org%2Fzhs%2F%25E8%25AF%258D%25E5%2585%25B8%2F%25E8%258B%25B1%25E8%25AF%25AD%2Flove&name=LOVE%E5%9C%A8%E5%89%91%E6%A1%A5%E8%8B%B1%E8%AF%AD%E8%AF%8D%E5%85%B8%E4%B8%AD%E7%9A%84%E8%A7%A3%E9%87%8A%E5%8F%8A%E7%BF%BB%E8%AF%91' target='_blank' data-social='tumblr' data-url='https://www.tumblr.com/share/link?url=https%3A%2F%2Fdictionary.cambridge.org%2Fzhs%2F%25E8%25AF%258D%25E5%2585%25B8%2F%25E8%258B%25B1%25E8%25AF%25AD%2Flove&name=LOVE%E5%9C%A8%E5%89%91%E6%A1%A5%E8%8B%B1%E8%AF%AD%E8%AF%8D%E5%85%B8%E4%B8%AD%E7%9A%84%E8%A7%A3%E9%87%8A%E5%8F%8A%E7%BF%BB%E8%AF%91' data-object='entry'>
<i class="fcdo fcdo-tumblr" aria-hidden="true"></i>
</a>
- <a class="circle bg--re socialShareLink" title="Share this entry on Reddit" href='https://www.reddit.com/submit?url=https%3A%2F%2Fdictionary.cambridge.org%2Fdictionary%2Fenglish%2Flove&title=love+Meaning+in+the+Cambridge+English+Dictionary' target='_blank' data-social='reddit' data-url='https://www.reddit.com/submit?url=https%3A%2F%2Fdictionary.cambridge.org%2Fdictionary%2Fenglish%2Flove&title=love+Meaning+in+the+Cambridge+English+Dictionary' data-object='entry'>
+ <a class="circle bg--re socialShareLink" title="在Reddit上分享该词条" href='https://www.reddit.com/submit?url=https%3A%2F%2Fdictionary.cambridge.org%2Fzhs%2F%25E8%25AF%258D%25E5%2585%25B8%2F%25E8%258B%25B1%25E8%25AF%25AD%2Flove&title=LOVE%E5%9C%A8%E5%89%91%E6%A1%A5%E8%8B%B1%E8%AF%AD%E8%AF%8D%E5%85%B8%E4%B8%AD%E7%9A%84%E8%A7%A3%E9%87%8A%E5%8F%8A%E7%BF%BB%E8%AF%91' target='_blank' data-social='reddit' data-url='https://www.reddit.com/submit?url=https%3A%2F%2Fdictionary.cambridge.org%2Fzhs%2F%25E8%25AF%258D%25E5%2585%25B8%2F%25E8%258B%25B1%25E8%25AF%25AD%2Flove&title=LOVE%E5%9C%A8%E5%89%91%E6%A1%A5%E8%8B%B1%E8%AF%AD%E8%AF%8D%E5%85%B8%E4%B8%AD%E7%9A%84%E8%A7%A3%E9%87%8A%E5%8F%8A%E7%BF%BB%E8%AF%91' data-object='entry'>
<i class="fcdo fcdo-reddit-alien" aria-hidden="true"></i>
</a>
- <a class="circle bg--def socialShareLink" title="Share this url" dsp-txt='https://dictionary.cambridge.org/dictionary/english/love' data-social='url' data-url='https://dictionary.cambridge.org/dictionary/english/love' data-object='entry'>
+ <a class="circle bg--def socialShareLink" title="分享这个链接" dsp-txt='https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD/love' data-social='url' data-url='https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD/love' data-object='entry'>
<i class="fcdo fcdo-link" aria-hidden="true"></i>
</a>
</div>
</div>
</div><div class="pos-body">
- <div class="sense-block" id="american-english-1-2-1">
-
- <h3 class="txt-block txt-block--alt2"><span class="hw">love</span> <span class="pos" title="A word that refers to a person, place, idea, event or thing.">noun</span> <span class="guideword" title="Guide word: helps you find the right meaning when a word has more than one meaning">
+ <div class="sense-block" id="cacd-1-2-1"> <h3 class="txt-block txt-block--alt2"><span class="hw">love</span> <span class="pos" title="A word that refers to a person, place, idea, event or thing.">noun</span> <span class="guideword" title="Guide word: helps you find the right meaning when a word has more than one meaning">
(<span>LIKING SOMEONE</span>)
- </span></h3>
- <div class="sense-body"><div class="phrase-block pad-indent"><span class="phrase-head"><span title="Phrase" class="phrase-title"><span class="phrase">fall in love</span></span></span><div class="phrase-body pad-indent">
- <div class="def-block pad-indent" data-wl-senseid="ID_00010529_04"><p class="def-head semi-flush"><span class="def-info"><span class="freq">›</span> </span><b class="def">If you <a class="query" href="https://dictionary.cambridge.org/dictionary/english/fall" title="fall">fall</a> in love you <a class="query" href="https://dictionary.cambridge.org/dictionary/english/begin" title="begin">begin</a> to love someone: </b></p><span class="def-body"><div class="examp emphasized"><span title="Example" class="eg">She’s <a class="query" href="https://dictionary.cambridge.org/dictionary/english/fall" title="fallen">fallen</a> in love and made <a class="query" href="https://dictionary.cambridge.org/dictionary/english/plan" title="plans">plans</a> to <a class="query" href="https://dictionary.cambridge.org/dictionary/english/marry" title="marry">marry</a>.</span></div></span></div>
- </div></div>
- <div class="def-block pad-indent" data-wl-senseid="ID_00010529_05"><p class="def-head semi-flush"><span class="def-info"><span class="freq">›</span> <span class="gram"><a href="https://dictionary.cambridge.org/help/codes.html">[<span class="gcs"> <span title="Uncountable noun: noun with no plural form. Cannot be used with 'a', 'an', or 'one'." class="gc">U</span> </span>]</a></span></span> <b class="def">You can write love/love from/all my love/<a class="query" href="https://dictionary.cambridge.org/dictionary/english/lot" title="lots">lots</a> of love before <a class="query" href="https://dictionary.cambridge.org/dictionary/english/your" title="your">your</a> <a class="query" href="https://dictionary.cambridge.org/dictionary/english/name" title="name">name</a> at the end of <a class="query" href="https://dictionary.cambridge.org/dictionary/english/capital" title="letters">letters</a> to <a class="query" href="https://dictionary.cambridge.org/dictionary/english/family" title="family">family</a> and <a class="query" href="https://dictionary.cambridge.org/dictionary/english/friend" title="friends">friends</a>.</b></p></div>
- <div class="phrase-block pad-indent"><span class="phrase-head"><span title="Phrase" class="phrase-title"><span class="phrase">in love</span></span></span><div class="phrase-body pad-indent">
- <div class="def-block pad-indent" data-wl-senseid="ID_00010529_06"><p class="def-head semi-flush"><span class="def-info"><span class="freq">›</span> </span><b class="def">A <a class="query" href="https://dictionary.cambridge.org/dictionary/english/person" title="person">person</a> who is in love is experiencing a <a class="query" href="https://dictionary.cambridge.org/dictionary/english/romantic" title="romantic">romantic</a> <a class="query" href="https://dictionary.cambridge.org/dictionary/english/attraction" title="attraction">attraction</a> for another <a class="query" href="https://dictionary.cambridge.org/dictionary/english/person" title="person">person</a>: </b></p><span class="def-body"><div class="examp emphasized"><span title="Example" class="eg">I <a class="query" href="https://dictionary.cambridge.org/dictionary/english/think" title="think">think</a> he's in love with Anna.</span></div></span></div>
- </div></div></div> </div></div></div></div></div></div></div>
- </div>
-
-
- <div class="definition-src"><p><small>(Definition of “love” from the <a href='https://dictionary.cambridge.org/dictionary/english/' title='Cambridge English Dictionaries' class='a--rev'><b>Cambridge Academic Content Dictionary</b></a> © Cambridge University Press)</small></p></div>
-
- </div>
-
- <div id="dataset-example" data-tab="ds-example" role="tabpanel">
- <div class="resp-hide--med">
- <div class="nav-entry-mob clrd">
- <div class="nav-entry-mob__datasets dropdown dropdown--pad-a dropdown--white">
- <span class="btn btn--dropdown js-toggle" data-target-selector="#cdo-mob-datasetsexample"><span id="mobEntryDictName">Examples</span></span>
- <div id="cdo-mob-datasetsexample" class="dropdown__box rounded">
- <ul class="unstyled">
- <li><a href="#dataset-british" class="js-trigger " data-tab="ds-british" data-target-trigger="#aTabEntrybritish" data-target-updtext="#mobEntryDictName">English</a></li>
- <li><a href="#dataset-american-english" class="js-trigger " data-tab="ds-american-english" data-target-trigger="#aTabEntryamerican-english" data-target-updtext="#mobEntryDictName">American</a></li>
- <li><a href="#dataset-example" class="js-trigger on " data-tab="ds-example" data-target-trigger="#aTabEntryexample" data-target-updtext="#mobEntryDictName">Examples</a></li>
- </ul>
+ </span></h3> <div class="sense-body"><div class="phrase-block pad-indent"><span class="phrase-head"><span class="phrase-title"><b class="phrase">fall in love</b></span></span><div class="phrase-body pad-indent">
+ <div class="def-block pad-indent" data-wl-senseid="CACD_00010529_04"><p class="def-head semi-flush"><span class="def-info"><span class="freq">›</span> </span><b class="def">If you <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD/fall" title="fall">fall</a> in love you <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD/begin" title="begin">begin</a> to love someone: </b></p><span class="def-body"><div class="examp emphasized"><span class="eg">She’s <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD/fallen" title="fallen">fallen</a> in love and made <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD/plan" title="plans">plans</a> to <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD/marry" title="marry">marry</a>.</span></div></span></div>
+ </div></div>
+ <div class="def-block pad-indent" data-wl-senseid="CACD_00010529_05"><p class="def-head semi-flush"><span class="def-info"><span class="freq">›</span> <span class="gram"><a href="https://dictionary.cambridge.org/zhs/help/codes.html">[<span class="gcs"> <span class="gc">U</span> </span>]</a></span></span> <b class="def">You can write love/love from/all my love/<a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD/lot" title="lots">lots</a> of love before <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD/your" title="your">your</a> <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD/name" title="name">name</a> at the end of <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD/capital" title="letters">letters</a> to <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD/family" title="family">family</a> and <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD/friend" title="friends">friends</a>.</b></p></div>
+ <div class="phrase-block pad-indent"><span class="phrase-head"><span class="phrase-title"><b class="phrase">in love</b></span></span><div class="phrase-body pad-indent">
+ <div class="def-block pad-indent" data-wl-senseid="CACD_00010529_06"><p class="def-head semi-flush"><span class="def-info"><span class="freq">›</span> </span><b class="def">A <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD/person" title="person">person</a> who is in love is <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD/experience" title="experiencing">experiencing</a> a <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD/romantic" title="romantic">romantic</a> <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD/attraction" title="attraction">attraction</a> for another <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD/person" title="person">person</a>: </b></p><span class="def-body"><div class="examp emphasized"><span class="eg">I <a class="query" href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD/think" title="think">think</a> he's in love with Anna.</span></div></span></div>
+ </div></div></div>
+ <div id='ad_contentslot_2' class='am-default contentslot'>
+ <script type='text/javascript'>
+ googletag.cmd.push(function() { googletag.display('ad_contentslot_2'); });
+ </script>
+ </div>
+ </div></div></div></div></div></div><div class="definition-src"><p><small>
+ (love在<a href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD/" title="剑桥学术词典" class="a--rev"><b>剑桥学术词典</b></a>的解释 © Cambridge University Press)
+ </small></p></div></div></div></div><div class="dataset" data-type="sorted" data-id="examples" id="dataset-examples" data-tab="ds-examples" role="tabpanel"> <div class="resp-hide--med">
+ <div class="nav-entry-mob clrd">
+ <div class="nav-entry-mob__datasets dropdown dropdown--pad-a dropdown--white">
+ <span class="btn btn--dropdown js-toggle" data-target-selector="#cdo-mob-datasetsexamples"><span id="mobEntryDictName">例句</span></span>
+ <div id="cdo-mob-datasetsexamples" class="dropdown__box rounded">
+ <ul class="unstyled">
+ <li><a href="#dataset-cald4" class="js-trigger " data-tab="ds-cald4" data-target-trigger="#aTabEntrycald4" data-target-updtext="#mobEntryDictName">英语</a></li>
+ <li><a href="#dataset-cacd" class="js-trigger " data-tab="ds-cacd" data-target-trigger="#aTabEntrycacd" data-target-updtext="#mobEntryDictName">美式</a></li>
+ <li><a href="#dataset-examples" class="js-trigger on " data-tab="ds-examples" data-target-trigger="#aTabEntryexamples" data-target-updtext="#mobEntryDictName">例句</a></li>
+ </ul>
+ </div>
+ </div>
+ <div> </div>
</div>
</div>
- </div>
- </div>
- <div class="entry-nav tabs__tabs js-tabs resp resp--med">
- <!-- NOTE: Tabs count added as a data attribute, can be added via js if required and used to size correctly -->
- <ul data-tabs-count=4 role="tablist">
- <li role="presentation">
- <a href="#dataset-british" id="aTabEntrybritish" class="js-trigger " data-tab="ds-british" role="tab" aria-selected="true" data-target-updtext="#mobEntryDictName">English</a>
- </li>
- <li role="presentation">
- <a href="#dataset-american-english" id="aTabEntryamerican-english" class="js-trigger " data-tab="ds-american-english" role="tab" aria-selected="true" data-target-updtext="#mobEntryDictName">American</a>
- </li>
-
- <li role="presentation">
- <a href="#dataset-example" id="aTabEntryexample" data-tab="ds-example" class="js-trigger on " role="tab" aria-selected="true" data-target-updtext="#mobEntryDictName">Examples</a>
- </li>
- </ul>
- </div>
- <div class="cdo-dblclick-area">
+ <div class="entry-nav tabs__tabs js-tabs resp resp--med">
+ <ul role="tablist" data-tabs-count="3">
+ <li role="presentation">
+ <a href="#dataset-cald4" id="aTabEntrycald4" class="js-trigger " data-tab="ds-cald4" role="tab" aria-selected="true" data-target-updtext="#mobEntryDictName">英语</a>
+ </li>
+ <li role="presentation">
+ <a href="#dataset-cacd" id="aTabEntrycacd" class="js-trigger " data-tab="ds-cacd" role="tab" aria-selected="true" data-target-updtext="#mobEntryDictName">美式</a>
+ </li>
+ <li role="presentation">
+ <a href="#dataset-examples" id="aTabEntryexamples" class="js-trigger on " data-tab="ds-examples" role="tab" aria-selected="true" data-target-updtext="#mobEntryDictName">例句</a>
+ </li>
+ </ul>
+ </div>
+ <div id="dataset-example" data-tab="ds-example" role="tabpanel">
+ <div class="cdo-dblclick-area">
<div class="cpexamps">
<div class="cpexamps-head">
- <div><h2>Examples for 'love'</h2></div>
- <p>These examples are from external sources. Click on the <span class="report-example-inappropriate-icon"><i aria-hidden="true" class="fcdo fcdo-comment-o fcdo-s18"> </i></span> icon to tell us what you think.</p>
- </div>
+ <div class="flex flex-res">
+ <h2>“love”的示例</h2> </div>
+ </div>
<div class="cpexamps-body">
+ <div class="ex-opinion italic">示例中的观点不代表剑桥词典编辑、剑桥大学出版社和其许可证颁发者的观点。</div>
<div class="cpegs">
<p class="margin-blue"></p>
<div class="egs">
- <div class="eg">
- <div>In this backdrop how a <em>love</em> story finds its place has been shown in the movie.</div>
- <div class="source">
- From <div class="wikipedia-source example-source italic">Wikipedia</div> <a class="report-example-inappropriate" data-href="https://dictionary.cambridge.org/putunga/report?exampleId=1678822" data-example-id="1678822"><i class="fcdo fcdo-comment-o fcdo-s18" title="Tell us what you think"></i></a>
+ <div class="eg">
+ <div><em>Love</em> with its treasures also tends to delight others in abundance.</div>
+ <div class="source">
+ 来自 <a href="http://www.cambridge.org/gb/cambridgeenglish/better-learning/deeper-insights/linguistics-pedagogy/cambridge-english-corpus" class="italic" target="_blank">Cambridge English Corpus</a> <a class="report-example-inappropriate" data-href="https://dictionary.cambridge.org/zhs/putunga/report?exampleId=10138540&datasetId=10133295" data-example-id="10138540" data-dataset-id="10133295"><i class="fcdo fcdo-comment-o fcdo-s18" title="请告诉我们您的意见"></i></a>
</div>
</div>
- <div class="eg">
- <div>They leave each other saying they <em>love</em> each other.</div>
- <div class="source">
- From <div class="wikipedia-source example-source italic">Wikipedia</div> <a class="report-example-inappropriate" data-href="https://dictionary.cambridge.org/putunga/report?exampleId=1678821" data-example-id="1678821"><i class="fcdo fcdo-comment-o fcdo-s18" title="Tell us what you think"></i></a>
+ <div class="eg">
+ <div>The question presented is who suffers more, the one whose loved one is dead or the one whose <em>love</em> is unrequited.</div>
+ <div class="source">
+ 来自 <a href="http://www.cambridge.org/gb/cambridgeenglish/better-learning/deeper-insights/linguistics-pedagogy/cambridge-english-corpus" class="italic" target="_blank">Cambridge English Corpus</a> <a class="report-example-inappropriate" data-href="https://dictionary.cambridge.org/zhs/putunga/report?exampleId=10138544&datasetId=10133295" data-example-id="10138544" data-dataset-id="10133295"><i class="fcdo fcdo-comment-o fcdo-s18" title="请告诉我们您的意见"></i></a>
</div>
</div>
- <div class="eg">
- <div>The four cornerstones that uniquely define the values of the organization are <em>love</em>, loyalty, harmony, and trust.</div>
- <div class="source">
- From <div class="wikipedia-source example-source italic">Wikipedia</div> <a class="report-example-inappropriate" data-href="https://dictionary.cambridge.org/putunga/report?exampleId=1678817" data-example-id="1678817"><i class="fcdo fcdo-comment-o fcdo-s18" title="Tell us what you think"></i></a>
+ <div class="eg">
+ <div>Although she ultimately returns his <em>love</em>, duty and glory take precedence.</div>
+ <div class="source">
+ 来自 <a href="http://www.cambridge.org/gb/cambridgeenglish/better-learning/deeper-insights/linguistics-pedagogy/cambridge-english-corpus" class="italic" target="_blank">Cambridge English Corpus</a> <a class="report-example-inappropriate" data-href="https://dictionary.cambridge.org/zhs/putunga/report?exampleId=10138548&datasetId=10133295" data-example-id="10138548" data-dataset-id="10133295"><i class="fcdo fcdo-comment-o fcdo-s18" title="请告诉我们您的意见"></i></a>
</div>
</div>
- <div class="eg">
- <div>Despite their political differences, she has fallen in <em>love</em> with him.</div>
- <div class="source">
- From <div class="wikipedia-source example-source italic">Wikipedia</div> <a class="report-example-inappropriate" data-href="https://dictionary.cambridge.org/putunga/report?exampleId=1678823" data-example-id="1678823"><i class="fcdo fcdo-comment-o fcdo-s18" title="Tell us what you think"></i></a>
+ <div class="eg">
+ <div>Here the final overcoming of obstacles and declaration of equality takes the form of a rococo interchangeability of persons in the <em>love</em> relationships.</div>
+ <div class="source">
+ 来自 <a href="http://www.cambridge.org/gb/cambridgeenglish/better-learning/deeper-insights/linguistics-pedagogy/cambridge-english-corpus" class="italic" target="_blank">Cambridge English Corpus</a> <a class="report-example-inappropriate" data-href="https://dictionary.cambridge.org/zhs/putunga/report?exampleId=10138552&datasetId=10133295" data-example-id="10138552" data-dataset-id="10133295"><i class="fcdo fcdo-comment-o fcdo-s18" title="请告诉我们您的意见"></i></a>
</div>
</div>
- <div class="eg">
- <div>The developers wanted to make games that we grew up playing and that we <em>love</em> playing.</div>
- <div class="source">
- From <div class="wikipedia-source example-source italic">Wikipedia</div> <a class="report-example-inappropriate" data-href="https://dictionary.cambridge.org/putunga/report?exampleId=1678824" data-example-id="1678824"><i class="fcdo fcdo-comment-o fcdo-s18" title="Tell us what you think"></i></a>
+ <div class="eg">
+ <div>There were dual aspects to these roles therefore : regulated discipline and loving advisorship.</div>
+ <div class="source">
+ 来自 <a href="http://www.cambridge.org/gb/cambridgeenglish/better-learning/deeper-insights/linguistics-pedagogy/cambridge-english-corpus" class="italic" target="_blank">Cambridge English Corpus</a> <a class="report-example-inappropriate" data-href="https://dictionary.cambridge.org/zhs/putunga/report?exampleId=10138556&datasetId=10133295" data-example-id="10138556" data-dataset-id="10133295"><i class="fcdo fcdo-comment-o fcdo-s18" title="请告诉我们您的意见"></i></a>
</div>
</div>
- <div class="eg">
- <div>He is much enamored with her but wonders if <em>love</em> can develop between two former enemies.</div>
- <div class="source">
- From <div class="wikipedia-source example-source italic">Wikipedia</div> <a class="report-example-inappropriate" data-href="https://dictionary.cambridge.org/putunga/report?exampleId=1678812" data-example-id="1678812"><i class="fcdo fcdo-comment-o fcdo-s18" title="Tell us what you think"></i></a>
+ <div class="eg">
+ <div>If the work is successful, spiritual well-being of connection is manifest as appreciation for life, <em>love</em> of others, and feeling connected to deceased loved ones.</div>
+ <div class="source">
+ 来自 <a href="http://www.cambridge.org/gb/cambridgeenglish/better-learning/deeper-insights/linguistics-pedagogy/cambridge-english-corpus" class="italic" target="_blank">Cambridge English Corpus</a> <a class="report-example-inappropriate" data-href="https://dictionary.cambridge.org/zhs/putunga/report?exampleId=10138560&datasetId=10133295" data-example-id="10138560" data-dataset-id="10133295"><i class="fcdo fcdo-comment-o fcdo-s18" title="请告诉我们您的意见"></i></a>
</div>
</div>
- <div class="eg">
- <div>First he needs <em>love</em> and to get the <em>love</em> he needs money.</div>
- <div class="source">
- From <div class="wikipedia-source example-source italic">Wikipedia</div> <a class="report-example-inappropriate" data-href="https://dictionary.cambridge.org/putunga/report?exampleId=1678820" data-example-id="1678820"><i class="fcdo fcdo-comment-o fcdo-s18" title="Tell us what you think"></i></a>
+ <div class="eg">
+ <div>After a long period of not seeing a partner's behaviour as loving, one may say that she no longer believes that he loves her.</div>
+ <div class="source">
+ 来自 <a href="http://www.cambridge.org/gb/cambridgeenglish/better-learning/deeper-insights/linguistics-pedagogy/cambridge-english-corpus" class="italic" target="_blank">Cambridge English Corpus</a> <a class="report-example-inappropriate" data-href="https://dictionary.cambridge.org/zhs/putunga/report?exampleId=10138564&datasetId=10133295" data-example-id="10138564" data-dataset-id="10133295"><i class="fcdo fcdo-comment-o fcdo-s18" title="请告诉我们您的意见"></i></a>
</div>
</div>
- <div class="eg">
- <div>Bo-hee replies that he never gave her enough strong <em>love</em>.</div>
- <div class="source">
- From <div class="wikipedia-source example-source italic">Wikipedia</div> <a class="report-example-inappropriate" data-href="https://dictionary.cambridge.org/putunga/report?exampleId=1678819" data-example-id="1678819"><i class="fcdo fcdo-comment-o fcdo-s18" title="Tell us what you think"></i></a>
+
+ <div id='ad_contentslot_3' class='am-default contentslot'>
+ <script type='text/javascript'>
+ googletag.cmd.push(function() { googletag.display('ad_contentslot_3'); });
+ </script>
+ </div>
+ <div class="eg">
+ <div>It therefore perfectly illustrates the fact that exiles <em>love</em> to write their own history.</div>
+ <div class="source">
+ 来自 <a href="http://www.cambridge.org/gb/cambridgeenglish/better-learning/deeper-insights/linguistics-pedagogy/cambridge-english-corpus" class="italic" target="_blank">Cambridge English Corpus</a> <a class="report-example-inappropriate" data-href="https://dictionary.cambridge.org/zhs/putunga/report?exampleId=10138568&datasetId=10133295" data-example-id="10138568" data-dataset-id="10133295"><i class="fcdo fcdo-comment-o fcdo-s18" title="请告诉我们您的意见"></i></a>
</div>
</div>
- <div class="eg">
- <div>Anyone who does not <em>love</em> animals does not <em>love</em> people either.</div>
- <div class="source">
- From <a href="http://www.statmt.org/europarl/" class="italic" target="_blank">Europarl Parallel Corpus - English</a> <a class="report-example-inappropriate" data-href="https://dictionary.cambridge.org/putunga/report?exampleId=1678818" data-example-id="1678818"><i class="fcdo fcdo-comment-o fcdo-s18" title="Tell us what you think"></i></a>
+ <div class="eg">
+ <div>As for the soul, <em>love</em> for eternal things can kindle fire within it and dry the humors of carnal desire that corrupt it.</div>
+ <div class="source">
+ 来自 <a href="http://www.cambridge.org/gb/cambridgeenglish/better-learning/deeper-insights/linguistics-pedagogy/cambridge-english-corpus" class="italic" target="_blank">Cambridge English Corpus</a> <a class="report-example-inappropriate" data-href="https://dictionary.cambridge.org/zhs/putunga/report?exampleId=10138572&datasetId=10133295" data-example-id="10138572" data-dataset-id="10133295"><i class="fcdo fcdo-comment-o fcdo-s18" title="请告诉我们您的意见"></i></a>
</div>
</div>
- <div class="eg">
- <div>He has been in <em>love</em> and devoted to her for a long time but his affections have not been reciprocated.</div>
- <div class="source">
- From <div class="wikipedia-source example-source italic">Wikipedia</div> <a class="report-example-inappropriate" data-href="https://dictionary.cambridge.org/putunga/report?exampleId=1678815" data-example-id="1678815"><i class="fcdo fcdo-comment-o fcdo-s18" title="Tell us what you think"></i></a>
+ <div class="eg">
+ <div>They also enhanced their beauty through facial tattooing, washing daily, plaiting and applying red ochre to their hair, wearing sweet-smelling leaves and using <em>love</em> medicines.</div>
+ <div class="source">
+ 来自 <a href="http://www.cambridge.org/gb/cambridgeenglish/better-learning/deeper-insights/linguistics-pedagogy/cambridge-english-corpus" class="italic" target="_blank">Cambridge English Corpus</a> <a class="report-example-inappropriate" data-href="https://dictionary.cambridge.org/zhs/putunga/report?exampleId=10138573&datasetId=10133295" data-example-id="10138573" data-dataset-id="10133295"><i class="fcdo fcdo-comment-o fcdo-s18" title="请告诉我们您的意见"></i></a>
</div>
</div>
- <div class="eg">
- <div>She falls in <em>love</em> with him later on.</div>
- <div class="source">
- From <div class="wikipedia-source example-source italic">Wikipedia</div> <a class="report-example-inappropriate" data-href="https://dictionary.cambridge.org/putunga/report?exampleId=1678825" data-example-id="1678825"><i class="fcdo fcdo-comment-o fcdo-s18" title="Tell us what you think"></i></a>
+ <div class="eg">
+ <div>There is some indication that her father had encouraged her to marry because he was afraid his daughter had fallen in <em>love</em> with learning.</div>
+ <div class="source">
+ 来自 <a href="http://www.cambridge.org/gb/cambridgeenglish/better-learning/deeper-insights/linguistics-pedagogy/cambridge-english-corpus" class="italic" target="_blank">Cambridge English Corpus</a> <a class="report-example-inappropriate" data-href="https://dictionary.cambridge.org/zhs/putunga/report?exampleId=10138576&datasetId=10133295" data-example-id="10138576" data-dataset-id="10133295"><i class="fcdo fcdo-comment-o fcdo-s18" title="请告诉我们您的意见"></i></a>
</div>
</div>
- <div class="eg">
- <div>She still wears her wedding ring and still cares for him and is not above testing his <em>love</em> for her.</div>
- <div class="source">
- From <div class="wikipedia-source example-source italic">Wikipedia</div> <a class="report-example-inappropriate" data-href="https://dictionary.cambridge.org/putunga/report?exampleId=1678811" data-example-id="1678811"><i class="fcdo fcdo-comment-o fcdo-s18" title="Tell us what you think"></i></a>
+ <div class="eg">
+ <div>The transformation of the refrain is the vehicle through which the lover affirms the value of his <em>love</em>.</div>
+ <div class="source">
+ 来自 <a href="http://www.cambridge.org/gb/cambridgeenglish/better-learning/deeper-insights/linguistics-pedagogy/cambridge-english-corpus" class="italic" target="_blank">Cambridge English Corpus</a> <a class="report-example-inappropriate" data-href="https://dictionary.cambridge.org/zhs/putunga/report?exampleId=10138585&datasetId=10133295" data-example-id="10138585" data-dataset-id="10133295"><i class="fcdo fcdo-comment-o fcdo-s18" title="请告诉我们您的意见"></i></a>
</div>
</div>
- <div class="eg">
- <div>Rudolfe befriends them and enters into a chaste <em>love</em> affair with the girl.</div>
- <div class="source">
- From <div class="wikipedia-source example-source italic">Wikipedia</div> <a class="report-example-inappropriate" data-href="https://dictionary.cambridge.org/putunga/report?exampleId=1678813" data-example-id="1678813"><i class="fcdo fcdo-comment-o fcdo-s18" title="Tell us what you think"></i></a>
+ <div class="eg">
+ <div>Analogously : we can pour out our <em>love</em> or attention on just any old object, but it won't necessarily stick, let alone mix with it.</div>
+ <div class="source">
+ 来自 <a href="http://www.cambridge.org/gb/cambridgeenglish/better-learning/deeper-insights/linguistics-pedagogy/cambridge-english-corpus" class="italic" target="_blank">Cambridge English Corpus</a> <a class="report-example-inappropriate" data-href="https://dictionary.cambridge.org/zhs/putunga/report?exampleId=10138586&datasetId=10133295" data-example-id="10138586" data-dataset-id="10133295"><i class="fcdo fcdo-comment-o fcdo-s18" title="请告诉我们您的意见"></i></a>
</div>
</div>
- <div class="eg">
- <div>He, however follows her to her house and tells her that he is in <em>love</em> with her.</div>
- <div class="source">
- From <div class="wikipedia-source example-source italic">Wikipedia</div> <a class="report-example-inappropriate" data-href="https://dictionary.cambridge.org/putunga/report?exampleId=1678816" data-example-id="1678816"><i class="fcdo fcdo-comment-o fcdo-s18" title="Tell us what you think"></i></a>
+ <div class="eg">
+ <div>He makes it clear that post-lapsarian human beings <em>love</em> inordinately, and must, because of the disordered fundamental orientation called original sin.</div>
+ <div class="source">
+ 来自 <a href="http://www.cambridge.org/gb/cambridgeenglish/better-learning/deeper-insights/linguistics-pedagogy/cambridge-english-corpus" class="italic" target="_blank">Cambridge English Corpus</a> <a class="report-example-inappropriate" data-href="https://dictionary.cambridge.org/zhs/putunga/report?exampleId=10138588&datasetId=10133295" data-example-id="10138588" data-dataset-id="10133295"><i class="fcdo fcdo-comment-o fcdo-s18" title="请告诉我们您的意见"></i></a>
</div>
</div>
- <div class="eg">
- <div>How will she be able to <em>love</em> him when he is not able to understand her needs?</div>
- <div class="source">
- From <div class="wikipedia-source example-source italic">Wikipedia</div> <a class="report-example-inappropriate" data-href="https://dictionary.cambridge.org/putunga/report?exampleId=1678814" data-example-id="1678814"><i class="fcdo fcdo-comment-o fcdo-s18" title="Tell us what you think"></i></a>
+ <div class="eg">
+ <div>Both set texts that elaborate variants of the type of mixed-gender exchange that characterised late sixteenthcentury courtly <em>love</em> discourse.</div>
+ <div class="source">
+ 来自 <a href="http://www.cambridge.org/gb/cambridgeenglish/better-learning/deeper-insights/linguistics-pedagogy/cambridge-english-corpus" class="italic" target="_blank">Cambridge English Corpus</a> <a class="report-example-inappropriate" data-href="https://dictionary.cambridge.org/zhs/putunga/report?exampleId=10138590&datasetId=10133295" data-example-id="10138590" data-dataset-id="10133295"><i class="fcdo fcdo-comment-o fcdo-s18" title="请告诉我们您的意见"></i></a>
</div>
</div>
</div>
- </div>
- </div>
+ </div>
+ </div>
</div>
</div> </div>
+ </div></div>
+ </div>
- <div class="clrd cdo-section mod-bloglist">
- <h2>Blogs about "love"</h2>
-
- <div class="cols cols--third">
- <div class="cols__col">
- <div class="mod mod--style4">
- <div class="pad">
- <p class="leader"><a href="http://dictionaryblog.cambridge.org/2014/10/01/what-a-lovely-dress-paying-and-accepting-compliments/" target="_blank" class="a--alt a--rev">What a lovely dress! Paying and accepting compliments.</a></p>
- </div>
- <p class="txt-block"><small class="smaller">
- by Liz Walter, <time>July 8, 2015</time> </small></p>
- </div>
- </div>
- </div>
-</div>
-
- <div class="clrd mod mod--style5 mod--dark mod-translate">
+ <div class="clrd mod mod--style5 mod--dark mod-translate">
<div class="pad mod-translate__lang bg-h round-right-aft" id="translations">
- <div><h2 class="h3">Translations of “love”</h2></div>
+ <div><h2 class="h3">“love”的翻译</h2></div>
<div class="translate__options dropdown dropdown--pad-a dropdown--white">
<span id="cdo-translation-current" class="btn btn--dropdown js-toggle" data-target-selector="#cdo-translation-opt"> </span>
<div id="cdo-translation-opt" class="dropdown__box rounded">
<ul class="unstyled">
- <li><a href="#" data-dataset="english-chinese-traditional">in Chinese (Traditional)</a></li>
- <li><a href="#" data-dataset="english-japanese">in Japanese</a></li>
- <li><a href="#" data-dataset="english-catalan">in Catalan</a></li>
- <li><a href="#" data-dataset="english-arabic">in Arabic</a></li>
- <li><a href="#" data-dataset="english-indonesian">in Indonesian</a></li>
- <li><a href="#" data-dataset="english-thai">in Thai</a></li>
- <li><a href="#" data-dataset="english-vietnamese">in Vietnamese</a></li>
- <li><a href="#" data-dataset="english-polish">in Polish</a></li>
- <li><a href="#" data-dataset="english-malaysian">in Malay</a></li>
- <li><a href="#" data-dataset="turkish">in Turkish</a></li>
- <li><a href="#" data-dataset="english-korean">in Korean</a></li>
- <li><a href="#" data-dataset="english-portuguese">in Portuguese</a></li>
- <li><a href="#" data-dataset="english-italian">in Italian</a></li>
- <li><a href="#" data-dataset="english-russian">in Russian</a></li>
- <li><a href="#" data-dataset="english-chinese-simplified">in Chinese (Simplified)</a></li>
- <li><a href="#" data-dataset="english-spanish">in Spanish</a></li>
+ <li><a href="#" data-dataset="english-chinese-traditional">在汉语（繁体）中</a></li>
+ <li><a href="#" data-dataset="english-french">在法语中</a></li>
+ <li><a href="#" data-dataset="english-japanese">在日语中</a></li>
+ <li><a href="#" data-dataset="english-catalan">在加泰罗尼亚语中</a></li>
+ <li><a href="#" data-dataset="english-arabic">在阿拉伯语中</a></li>
+ <li><a href="#" data-dataset="english-danish">in Danish</a></li>
+ <li><a href="#" data-dataset="english-czech">in Czech</a></li>
+ <li><a href="#" data-dataset="english-indonesian">在印尼语中</a></li>
+ <li><a href="#" data-dataset="english-vietnamese">在越南语中</a></li>
+ <li><a href="#" data-dataset="english-thai">在泰语中</a></li>
+ <li><a href="#" data-dataset="english-polish">在波兰语中</a></li>
+ <li><a href="#" data-dataset="english-malaysian">在马来语中</a></li>
+ <li><a href="#" data-dataset="turkish">在土耳其语中</a></li>
+ <li><a href="#" data-dataset="english-german">在德语中</a></li>
+ <li><a href="#" data-dataset="english-norwegian">in Norwegian</a></li>
+ <li><a href="#" data-dataset="english-korean">在韩语中</a></li>
+ <li><a href="#" data-dataset="english-portuguese">在葡萄牙语中</a></li>
+ <li><a href="#" data-dataset="english-chinese-simplified">在汉语（简体）中</a></li>
+ <li><a href="#" data-dataset="english-italian">在意大利语中</a></li>
+ <li><a href="#" data-dataset="english-russian">在俄语中</a></li>
</ul>
</div>
</div>
<ul id="cdo-translation-val" class="unstyled">
<li data-dataset="english-chinese-traditional">
- <a href="https://dictionary.cambridge.org/dictionary/english-chinese-traditional/love" title="love: Chinese (Traditional) translation" class="helper ico-bg-abs ico-bg--arrow-end">
+ <a href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%B9%81%E4%BD%93/love" title="love：汉语（繁体）翻译" class="helper ico-bg-abs ico-bg--arrow-end">
<span class="point"></span>
<p class="flush">喜歡某人, 愛，喜愛, 喜歡某物…</p>
</a>
+ </li>
+ <li data-dataset="english-french">
+ <a href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B3%95%E8%AF%AD/love" title="love：法语翻译" class="helper ico-bg-abs ico-bg--arrow-end">
+ <span class="point"></span>
+ <p class="flush">amour, affectueusement, amicalement…</p>
+ </a>
</li>
<li data-dataset="english-japanese">
- <a href="https://dictionary.cambridge.org/dictionary/english-japanese/love" title="love: Japanese translation" class="helper ico-bg-abs ico-bg--arrow-end">
+ <a href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%97%A5%E8%AF%AD/love" title="love：日语翻译" class="helper ico-bg-abs ico-bg--arrow-end">
<span class="point"></span>
<p class="flush">～を（性的な思いを持って）愛する, （家族や友達）を大切に思っている, ～が大好きだ…</p>
</a>
</li>
<li data-dataset="english-catalan">
- <a href="https://dictionary.cambridge.org/dictionary/english-catalan/love" title="love: Catalan translation" class="helper ico-bg-abs ico-bg--arrow-end">
+ <a href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E5%8A%A0%E6%B3%B0%E7%BD%97%E5%B0%BC%E4%BA%9A%E8%AF%AD/love" title="love：加泰罗尼亚语翻译" class="helper ico-bg-abs ico-bg--arrow-end">
<span class="point"></span>
<p class="flush">estimar, adorar, amor…</p>
</a>
</li>
<li data-dataset="english-arabic">
- <a href="https://dictionary.cambridge.org/dictionary/english-arabic/love" title="love: Arabic translation" class="helper ico-bg-abs ico-bg--arrow-end">
+ <a href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E9%98%BF%E6%8B%89%E4%BC%AF%E8%AF%AD/love" title="love：阿拉伯语翻译" class="helper ico-bg-abs ico-bg--arrow-end">
<span class="point"></span>
<p class="flush">يُحِبّ, يُغْرِم بـِ, حُبّ…</p>
</a>
</li>
- <li data-dataset="english-indonesian">
- <a href="https://dictionary.cambridge.org/dictionary/english-indonesian/love_1" title="love: Indonesian translation" class="helper ico-bg-abs ico-bg--arrow-end">
+ <li data-dataset="english-danish">
+ <a href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E4%B8%B9%E9%BA%A6%E8%AF%AD/love" title="love: Danish translation" class="helper ico-bg-abs ico-bg--arrow-end">
<span class="point"></span>
- <p class="flush">sayang, cinta, kecintaan…</p>
+ <p class="flush">kærlighed, forelskelse, være forelsket…</p>
</a>
</li>
- <li data-dataset="english-thai">
- <a href="https://dictionary.cambridge.org/dictionary/english-thai/love_1" title="love: Thai translation" class="helper ico-bg-abs ico-bg--arrow-end">
+ <li data-dataset="english-czech">
+ <a href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%8D%B7%E5%85%8B%E8%AF%AD/love" title="love: Czech translation" class="helper ico-bg-abs ico-bg--arrow-end">
<span class="point"></span>
- <p class="flush">ความรัก, หลงรัก, แต้มศูนย์ (เทนนิส)…</p>
+ <p class="flush">láska, zamilovanost, nula…</p>
+ </a>
+ </li>
+ <li data-dataset="english-indonesian">
+ <a href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E5%8D%B0%E5%BA%A6%E5%B0%BC%E8%A5%BF%E4%BA%9A%E8%AF%AD/love_1" title="love：印尼语翻译" class="helper ico-bg-abs ico-bg--arrow-end">
+ <span class="point"></span>
+ <p class="flush">sayang, cinta, kecintaan…</p>
</a>
</li>
<li data-dataset="english-vietnamese">
- <a href="https://dictionary.cambridge.org/dictionary/english-vietnamese/love_1" title="love: Vietnamese translation" class="helper ico-bg-abs ico-bg--arrow-end">
+ <a href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E8%B6%8A%E5%8D%97%E8%AF%AD/love_1" title="love：越南语翻译" class="helper ico-bg-abs ico-bg--arrow-end">
<span class="point"></span>
<p class="flush">yêu thích, tình yêu, người…</p>
</a>
+ </li>
+ <li data-dataset="english-thai">
+ <a href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B3%B0%E8%AF%AD/love_1" title="love：泰语翻译" class="helper ico-bg-abs ico-bg--arrow-end">
+ <span class="point"></span>
+ <p class="flush">ความรัก, หลงรัก, แต้มศูนย์ (เทนนิส)…</p>
+ </a>
</li>
<li data-dataset="english-polish">
- <a href="https://dictionary.cambridge.org/dictionary/english-polish/love_1" title="love: Polish translation" class="helper ico-bg-abs ico-bg--arrow-end">
+ <a href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B3%A2%E5%85%B0%E8%AF%AD/love_1" title="love：波兰语翻译" class="helper ico-bg-abs ico-bg--arrow-end">
<span class="point"></span>
<p class="flush">kochać, bardzo lubić, uwielbiać…</p>
</a>
</li>
<li data-dataset="english-malaysian">
- <a href="https://dictionary.cambridge.org/dictionary/english-malaysian/love_1" title="love: Malay translation" class="helper ico-bg-abs ico-bg--arrow-end">
+ <a href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E9%A9%AC%E6%9D%A5%E8%A5%BF%E4%BA%9A%E8%AF%AD/love_1" title="love：马来语翻译" class="helper ico-bg-abs ico-bg--arrow-end">
<span class="point"></span>
<p class="flush">cinta, mencintai, kegemaran…</p>
</a>
</li>
<li data-dataset="turkish">
- <a href="https://dictionary.cambridge.org/dictionary/turkish/love_1" title="love Turkish translation" class="helper ico-bg-abs ico-bg--arrow-end">
+ <a href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E5%9C%9F%E8%80%B3%E5%85%B6%E8%AF%AD/love_1" title="love的土耳其语翻译" class="helper ico-bg-abs ico-bg--arrow-end">
<span class="point"></span>
<p class="flush">sevmek, gönül vermek, âşık olmak…</p>
</a>
</li>
- <li data-dataset="english-korean">
- <a href="https://dictionary.cambridge.org/dictionary/english-korean/love" title="love: Korean translation" class="helper ico-bg-abs ico-bg--arrow-end">
+ <li data-dataset="english-german">
+ <a href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E5%BE%B7%E8%AF%AD/love" title="love：德语翻译" class="helper ico-bg-abs ico-bg--arrow-end">
<span class="point"></span>
- <p class="flush">사랑하다, 매우 좋아하다, 사랑…</p>
+ <p class="flush">die Liebe, null, lieben…</p>
</a>
</li>
- <li data-dataset="english-portuguese">
- <a href="https://dictionary.cambridge.org/dictionary/english-portuguese/love" title="love: Portuguese translation" class="helper ico-bg-abs ico-bg--arrow-end">
+ <li data-dataset="english-norwegian">
+ <a href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%8C%AA%E5%A8%81%E8%AF%AD/love" title="love: Norwegian translation" class="helper ico-bg-abs ico-bg--arrow-end">
<span class="point"></span>
- <p class="flush">amar, adorar, amor…</p>
+ <p class="flush">kjærlighet, forelskelse, hengivenhet…</p>
</a>
</li>
- <li data-dataset="english-italian">
- <a href="https://dictionary.cambridge.org/dictionary/english-italian/love" title="love: Italian translation" class="helper ico-bg-abs ico-bg--arrow-end">
+ <li data-dataset="english-korean">
+ <a href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E9%9F%A9%E8%AF%AD/love" title="love：韩语翻译" class="helper ico-bg-abs ico-bg--arrow-end">
<span class="point"></span>
- <p class="flush">amare, amore, affetto…</p>
+ <p class="flush">사랑하다, 매우 좋아하다, 사랑…</p>
</a>
</li>
- <li data-dataset="english-russian">
- <a href="https://dictionary.cambridge.org/dictionary/english-russian/love_1" title="love: Russian translation" class="helper ico-bg-abs ico-bg--arrow-end">
+ <li data-dataset="english-portuguese">
+ <a href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E8%91%A1%E8%90%84%E7%89%99%E8%AF%AD/love" title="love：葡萄牙语翻译" class="helper ico-bg-abs ico-bg--arrow-end">
<span class="point"></span>
- <p class="flush">любить…</p>
+ <p class="flush">amar, adorar, amor…</p>
</a>
</li>
<li data-dataset="english-chinese-simplified">
- <a href="https://dictionary.cambridge.org/dictionary/english-chinese-simplified/love" title="love: Chinese (Simplified) translation" class="helper ico-bg-abs ico-bg--arrow-end">
+ <a href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%B1%89%E8%AF%AD-%E7%AE%80%E4%BD%93/love" title="love：汉语（简体）翻译" class="helper ico-bg-abs ico-bg--arrow-end">
<span class="point"></span>
<p class="flush">喜欢某人, 爱，喜爱, 喜欢某物…</p>
</a>
</li>
- <li data-dataset="english-spanish">
- <a href="https://dictionary.cambridge.org/dictionary/english-spanish/love_1" title="love Spanish translation" class="helper ico-bg-abs ico-bg--arrow-end">
+ <li data-dataset="english-italian">
+ <a href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E6%84%8F%E5%A4%A7%E5%88%A9%E8%AF%AD/love" title="love：意大利语翻译" class="helper ico-bg-abs ico-bg--arrow-end">
+ <span class="point"></span>
+ <p class="flush">amare, amore, affetto…</p>
+ </a>
+ </li>
+ <li data-dataset="english-russian">
+ <a href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD-%E4%BF%84%E8%AF%AD/love_1" title="love：俄语翻译" class="helper ico-bg-abs ico-bg--arrow-end">
<span class="point"></span>
- <p class="flush">amor, guapo, cielo…</p>
+ <p class="flush">любить…</p>
</a>
</li>
</ul>
</div>
<div class="txt-block txt-block--padder mod-translate__tool round-right">
- <div class="h3">Need a translator?</div>
- <p ><a href="https://dictionary.cambridge.org/translate/" class="btn btn--impact btn--translate shadow--dark">Translator tool</a></p>
- <p>Get a quick, free translation!</p>
+ <div class="h3">需要一个翻译器吗？</div>
+ <p ><a href="https://dictionary.cambridge.org/zhs/translate/" class="btn btn--impact btn--translate shadow--dark">翻译器工具</a></p>
+ <p>获得快速的，免费的翻译！</p>
</div>
</div>
<div class="mod mod-pronounce">
- <a href="https://dictionary.cambridge.org/pronunciation/english/love" title="love pronunciation in English" class="txt-block txt-block--impact ico-bg-abs">What is the pronunciation of love?</a>
+ <a href="/zhs/%E5%8F%91%E9%9F%B3/%E8%8B%B1%E8%AF%AD/love" title="love在英语的发音" class="txt-block txt-block--impact ico-bg-abs">love的发音是什么？</a>
</div>
- </div>
-
- <div class="clrd">
- <div class="mod float-xl">
-
- <div id='ad_btmslot_a' class='am-default '>
- <script type='text/javascript'>
- googletag.cmd.push(function() { googletag.display('ad_btmslot_a'); });
- </script>
- </div>
- <div id='ad_houseslot_b' class='am-default '>
- <script type='text/javascript'>
- googletag.cmd.push(function() { googletag.display('ad_houseslot_b'); });
- </script>
- </div>
- </div>
</div>
<div class="clrd">
<div class="oflow-hide">
<div class="mod mod--border mod-browser">
<div class="mod-browser__title center">
- <div class="center-y lower"><h2 class="h3"><b>Browse</b></h2></div>
+ <div class="center-y lower"><h2 class="h3"><b>浏览</b></h2></div>
</div>
<div class="oflow-hide scroller scroller--blur js-scroller grad-trans-pseudo">
<div class="scroller__content js-scroller-content">
<ul class="unstyled a--b a--rev a--alt">
- <li>
- <a href="https://dictionary.cambridge.org/dictionary/english/lout" title="lout"><span class="entry_title"><span class="results"><span class="base"><b class="hw">lout</b></span></span></span></a>
+ <li>
+ <a href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD/lout" title="lout">
+ <span class="entry_title"><span class="results"><span class="base"><b class="hw">lout</b></span></span></span>
+ </a>
</li>
- <li>
- <a href="https://dictionary.cambridge.org/dictionary/english/louvre" title="louvre"><span class="entry_title"><span class="results"><span class="base"><b class="hw">louvre</b></span></span></span></a>
+ <li>
+ <a href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD/louvre" title="louvre">
+ <span class="entry_title"><span class="results"><span class="base"><b class="hw">louvre</b></span></span></span>
+ </a>
</li>
- <li>
- <a href="https://dictionary.cambridge.org/dictionary/english/lovable" title="lovable"><span class="entry_title"><span class="results"><span class="base"><b class="hw">lovable</b></span></span></span></a>
+ <li>
+ <a href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD/lovable" title="lovable">
+ <span class="entry_title"><span class="results"><span class="base"><b class="hw">lovable</b></span></span></span>
+ </a>
</li>
- <li>
- <a href="https://dictionary.cambridge.org/dictionary/english/lovage" title="lovage"><span class="entry_title"><span class="results"><span class="base"><b class="hw">lovage</b></span></span></span></a>
+ <li>
+ <a href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD/lovage" title="lovage">
+ <span class="entry_title"><span class="results"><span class="base"><b class="hw">lovage</b></span></span></span>
+ </a>
</li>
- <li>
+ <li>
<span class="entry_title"><span class="results"><span class="base"><b class="hw">love</b></span></span></span>
+ </li>
+ <li>
+ <a href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD/love-affair" title="love affair">
+ <span class="entry_title"><span class="results"><span class="base"><b class="hw">love affair</b></span></span></span>
+ </a>
</li>
- <li>
- <a href="https://dictionary.cambridge.org/dictionary/english/love-affair" title="love affair"><span class="entry_title"><span class="results"><span class="base"><b class="hw">love affair</b></span></span></span></a>
+ <li>
+ <a href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD/love-bite" title="love bite">
+ <span class="entry_title"><span class="results"><span class="base"><b class="hw">love bite</b></span></span></span>
+ </a>
</li>
- <li>
- <a href="https://dictionary.cambridge.org/dictionary/english/love-bite" title="love bite"><span class="entry_title"><span class="results"><span class="base"><b class="hw">love bite</b></span></span></span></a>
+ <li>
+ <a href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD/love-child" title="love child">
+ <span class="entry_title"><span class="results"><span class="base"><b class="hw">love child</b></span></span></span>
+ </a>
</li>
- <li>
- <a href="https://dictionary.cambridge.org/dictionary/english/love-child" title="love child"><span class="entry_title"><span class="results"><span class="base"><b class="hw">love child</b></span></span></span></a>
- </li>
- <li>
- <a href="https://dictionary.cambridge.org/dictionary/english/love-handles" title="love handles"><span class="entry_title"><span class="results"><span class="base"><b class="hw">love handles</b></span></span></span></a>
+ <li>
+ <a href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD/love-handles" title="love handles">
+ <span class="entry_title"><span class="results"><span class="base"><b class="hw">love handles</b></span></span></span>
+ </a>
</li>
</ul>
</div>
@@ -2255,63 +2316,61 @@ <h2>Blogs about "love"</h2>
</div>
</div>
</div>
+
+ <div class="clrd">
+ <div class="mod float-xl">
+
+ <div id='ad_btmslot_a' class='am-default '>
+ <script type='text/javascript'>
+ googletag.cmd.push(function() { googletag.display('ad_btmslot_a'); });
+ </script>
+ </div>
+
+ <div id='ad_houseslot_b' class='am-default '>
+ <script type='text/javascript'>
+ googletag.cmd.push(function() { googletag.display('ad_houseslot_b'); });
+ </script>
+ </div>
+ </div>
</div>
+</div>
+
<div class="cdo-tpl__z cdo-tpl-main__z3 clrd">
- <div class="mod mod--dark mod--style1">
- <div class="pad">
- <p class="leader">Create and share your own word lists and quizzes for free!</p>
- <p>
- <a href="#" class="btn btn--impact btn--s13 js-toggle" data-target-selector="#modal-login"><b>Sign up now</b></a>
- <a href="#" class="btn btn--impact2 btn--s13 js-toggle" data-target-selector="#modal-login"><b>Log in</b></a>
- </p>
+ <div class="mod mod--style1 pad">
+ <div class="pad">
+ <div class="h2 semi-flush">我的词典</div>
+ <p>免费创建并分享自己的单词列表和小测验！</p>
+ <p>
+ <a class="btn btn--white btn--s13 registerBtn btn--forbidden"><b>现在就注册</b></a>
+ <a class="btn btn--impact2 btn--s13 loginBtn btn--forbidden"><b>登录</b></a>
+ </p>
</div>
- </div>
-
- <div class="resp-show--med">
- <aside role="complementary">
- <div data-toc="ds-british" class="mod mod--style4 mod--flush mod-toc resp resp--med" style="display:block" >
- <div class="h3 txt-block txt-block--alt3 flush resp-show--med">Contents</div>
- <ul class="unstyled unstyled-nest accord js-accord-ul">
+</div>
+ <div> <div id="" class=" resp-show--med "><aside role="complementary"><div data-toc="ds-english" class="mod mod--style4 mod--flush mod-toc">
+<div class="h3 txt-block txt-block--alt3 flush resp-show--med">内容</div>
+<ul class="unstyled unstyled-nest accord js-accord-ul">
<li class="section">
<a>verb <span class="smaller">(2)</span></a><ul>
-<li><a onclick="ga('send','event', 'navigation', 'navigation-link' );" href="#british-1-1-1" title="love meaning
+<li><a onclick="ga('send','event', 'navigation', 'navigation-link' );" href="#cald4-1-1-1" title="love 意思
"><span class="hw">love</span> <span class="alt gw">(LIKE SOMEONE)</span></a></li>
-<li><a onclick="ga('send','event', 'navigation', 'navigation-link' );" href="#british-1-1-2" title="love meaning
+<li><a onclick="ga('send','event', 'navigation', 'navigation-link' );" href="#cald4-1-1-2" title="love 意思
"><span class="hw">love</span> <span class="alt gw">(LIKE SOMETHING)</span></a></li>
</ul>
</li>
<li class="section">
<a>noun <span class="smaller">(3)</span></a><ul>
-<li><a onclick="ga('send','event', 'navigation', 'navigation-link' );" href="#british-1-2-1" title="love meaning
+<li><a onclick="ga('send','event', 'navigation', 'navigation-link' );" href="#cald4-1-2-1" title="love 意思
"><span class="hw">love</span> <span class="alt gw">(LIKING SOMEONE)</span></a></li>
-<li><a onclick="ga('send','event', 'navigation', 'navigation-link' );" href="#british-1-2-2" title="love meaning
+<li><a onclick="ga('send','event', 'navigation', 'navigation-link' );" href="#cald4-1-2-2" title="love 意思
"><span class="hw">love</span> <span class="alt gw">(LIKING SOMETHING)</span></a></li>
-<li><a onclick="ga('send','event', 'navigation', 'navigation-link' );" href="#british-1-2-3" title="love meaning
+<li><a onclick="ga('send','event', 'navigation', 'navigation-link' );" href="#cald4-1-2-3" title="love 意思
"><span class="hw">love</span> <span class="alt gw">(TENNIS)</span></a></li>
</ul>
</li>
</ul>
- </div>
- <div data-toc="ds-american-english" class="mod mod--style4 mod--flush mod-toc resp resp--med" style="display:none">
- <div class="h3 txt-block txt-block--alt3 flush resp-show--med">Contents</div>
- <ul class="unstyled unstyled-nest accord js-accord-ul">
-<li class="section">
-<a>verb <span class="smaller">(2)</span></a><ul>
-<li><a onclick="ga('send','event', 'navigation', 'navigation-link' );" href="#american-english-1-1-1" title="love meaning
- "><span class="hw">love</span> <span class="alt gw">(LIKE SOMEONE)</span></a></li>
-<li><a onclick="ga('send','event', 'navigation', 'navigation-link' );" href="#american-english-1-1-2" title="love meaning
- "><span class="hw">love</span> <span class="alt gw">(LIKE SOMETHING)</span></a></li>
-</ul>
-</li>
-<li class="section">
-<a>noun <span class="smaller">(1)</span></a><ul><li><a onclick="ga('send','event', 'navigation', 'navigation-link' );" href="#american-english-1-2-1" title="love meaning
- "><span class="hw">love</span> <span class="alt gw">(LIKING SOMEONE)</span></a></li></ul>
-</li>
-</ul>
- </div>
- </aside> </div>
+</div></aside></div> </div>
<div id='ad_rightslot' class='am-default '>
@@ -2320,104 +2379,104 @@ <h2>Blogs about "love"</h2>
</script>
</div>
- <div class="mod mod--style4 mod--border">
- <h2 class="h3 txt-block txt-block--alt round-top flush">
- More meanings of “love”
- </h2>
-
- <div class="tabs tabs--block js-tabs-wrap clrd">
- <div class="tabs__tabs js-tabs">
- <ul>
-
- <li>
- <a href="#more-results" data-tab="all" class="on"
- title="All “love” meanings in English">
- All
- </a>
- </li>
- <li>
- <a href="#more-results-idioms" data-tab="idioms"
- title="Meanings for “love” in idioms in English">
- Idioms
- </a>
- </li>
- </ul>
- </div>
-
- <div class="tabs__content mod-more on" data-tab="all" id="more-results">
- <div class="pad">
- <ul class="unstyled link-list results">
-
- <li>
- <a href="https://dictionary.cambridge.org/dictionary/english/head-over-heels-in-love" data-gaCategory="more-result" data-gaAction="more-result-link" title="head over heels (in love) idiom" class="moreResult">
- <span class='arl7'><span class="base"><b class="phrase">head over heels (in love)</b></span> <span class="pos">idiom</span></span>
- </a>
- </li>
-
- <li>
- <a href="https://dictionary.cambridge.org/dictionary/english/true" data-gaCategory="more-result" data-gaAction="more-result-link" title="true love" class="moreResult">
- <span class='arl6'><span class="base" targettype="phrase"><b class="phrase">true love</b></span></span>
- </a>
- </li>
-
- <li>
- <a href="https://dictionary.cambridge.org/dictionary/english/love-affair" data-gaCategory="more-result" data-gaAction="more-result-link" title="love affair" class="moreResult">
- <span class='arl3'><span class="base"><b class="hw">love affair</b></span></span>
- </a>
- </li>
-
- <li>
- <a href="https://dictionary.cambridge.org/dictionary/english/love-seat" data-gaCategory="more-result" data-gaAction="more-result-link" title="love seat" class="moreResult">
- <span class='arl3'><span class="base"><b class="hw">love seat</b></span></span>
- </a>
- </li>
-
- <li>
- <a href="https://dictionary.cambridge.org/dictionary/english/send-someone-s-love-to-someone" data-gaCategory="more-result" data-gaAction="more-result-link" title="send someone’s love (to someone) idiom" class="moreResult">
- <span class='arl7'><span class="base"><b class="phrase">send <i class="obj">someone’s</i> love (to <i class="obj">someone</i>)</b></span> <span class="pos">idiom</span></span>
- </a>
- </li>
-
- <li>
- <a href="https://dictionary.cambridge.org/dictionary/english/puppy-love" data-gaCategory="more-result" data-gaAction="more-result-link" title="puppy love" class="moreResult">
- <span class='arl3'><span class="base"><b class="hw">puppy love</b></span></span>
- </a>
- </li>
-
- <li>
- <a href="https://dictionary.cambridge.org/dictionary/english/make-love" data-gaCategory="more-result" data-gaAction="more-result-link" title="make love idiom" class="moreResult">
- <span class='arl7'><span class="base"><b class="phrase">make love</b></span> <span class="pos">idiom</span></span>
- </a>
- </li>
- </ul>
- </div>
- <a href="https://dictionary.cambridge.org/search/english/?q=love" class="txt-block"
- title="All meanings for love in English"
- onClick="ga('send','event', 'more-result', 'see-all-meaning' );">
- <span>See all meanings</span> <i class="fcdo fcdo-angle-right" aria-hidden="true"></i>
- </a>
- </div>
-
-
- <div class="tabs__content mod-more" data-tab="idioms" id="more-results-idioms">
- <div class="pad">
- <ul class="unstyled link-list results">
- <li><a href="https://dictionary.cambridge.org/dictionary/english/head-over-heels-in-love" title="head over heels (in love) idiom"><span class='arl7'><span class="base"><b class="phrase">head over heels (in love)</b></span> <span class="pos">idiom</span></span></a></li>
- <li><a href="https://dictionary.cambridge.org/dictionary/english/for-love-nor-money" title="for love nor money idiom"><span class='arl7'><span class="base"><b class="phrase">for love nor money</b></span> <span class="pos">idiom</span></span></a></li>
- <li><a href="https://dictionary.cambridge.org/dictionary/english/be-no-little-love-lost-between" title="be no/little love lost between idiom"><span class='arl7'><span class="base"><b class="phrase">be no/little love lost between</b></span> <span class="pos">idiom</span></span></a></li>
- <li><a href="https://dictionary.cambridge.org/dictionary/english/send-someone-s-love-to-someone" title="send someone’s love (to someone) idiom"><span class='arl7'><span class="base"><b class="phrase">send <i class="obj">someone’s</i> love (to <i class="obj">someone</i>)</b></span> <span class="pos">idiom</span></span></a></li>
- <li><a href="https://dictionary.cambridge.org/dictionary/english/make-love" title="make love idiom"><span class='arl7'><span class="base"><b class="phrase">make love</b></span> <span class="pos">idiom</span></span></a></li>
- <li><a href="https://dictionary.cambridge.org/dictionary/english/love-sb-to-bits" title="love sb to bits idiom"><span class='arl7'><span class="base"><b class="phrase">love <i title="sb: abbreviation for somebody." class="obj">sb</i> to bits</b></span> <span class="pos">idiom</span></span></a></li>
- <li><a href="https://dictionary.cambridge.org/dictionary/english/love-me-love-my-dog" title="love me, love my dog idiom"><span class='arl7'><span class="base"><b class="phrase">love me, love my dog</b></span> <span class="pos">idiom</span></span></a></li>
- </ul>
- </div>
-
- <a href="https://dictionary.cambridge.org/search/english/?q=love&type=idiom" class="txt-block"
- title="All idiom meanings of love in English">
- <span>See all idiom meanings</span> <i class="fcdo fcdo-angle-right"></i>
- </a>
- </div>
- </div>
+
+ <div class="mod mod--style4 mod--border">
+ <h2 class="h3 txt-block txt-block--alt round-top flush">
+ “love”的更多意思
+ </h2>
+
+ <div class="tabs tabs--block js-tabs-wrap clrd">
+ <div class="tabs__tabs js-tabs">
+ <ul>
+ <li>
+ <a href="#more-results" data-tab="all" class="on"
+ title="“love”在英语中的全部意思">
+ 全部
+ </a>
+ </li>
+ <li>
+ <a href="#more-results-idioms" data-tab="idioms"
+ title="英语里“love”在惯用语中的意思">
+ 惯用语
+ </a>
+ </li>
+ </ul>
+ </div>
+
+ <div class="tabs__content mod-more on" data-tab="all" id="more-results">
+ <div class="pad">
+ <ul class="unstyled link-list results">
+
+ <li>
+ <a href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD/love-affair" data-gaCategory="more-result" data-gaAction="more-result-link" title="love affair" class="moreResult">
+ <span class='arl3'><span class="base"><b class="hw">love affair</b></span></span>
+ </a>
+ </li>
+
+ <li>
+ <a href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD/love-seat" data-gaCategory="more-result" data-gaAction="more-result-link" title="love seat" class="moreResult">
+ <span class='arl3'><span class="base"><b class="hw">love seat</b></span></span>
+ </a>
+ </li>
+
+ <li>
+ <a href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD/puppy-love" data-gaCategory="more-result" data-gaAction="more-result-link" title="puppy love" class="moreResult">
+ <span class='arl3'><span class="base"><b class="hw">puppy love</b></span></span>
+ </a>
+ </li>
+
+ <li>
+ <a href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD/tough-love" data-gaCategory="more-result" data-gaAction="more-result-link" title="tough love" class="moreResult">
+ <span class='arl3'><span class="base"><b class="hw">tough love</b></span></span>
+ </a>
+ </li>
+
+ <li>
+ <a href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD/love-in" data-gaCategory="more-result" data-gaAction="more-result-link" title="love-in" class="moreResult">
+ <span class='arl3'><span class="base"><b class="hw">love-in</b></span></span>
+ </a>
+ </li>
+
+ <li>
+ <a href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD/love-rat" data-gaCategory="more-result" data-gaAction="more-result-link" title="love rat" class="moreResult">
+ <span class='arl3'><span class="base"><b class="hw">love rat</b></span></span>
+ </a>
+ </li>
+
+ <li>
+ <a href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD/free-love" data-gaCategory="more-result" data-gaAction="more-result-link" title="free love" class="moreResult">
+ <span class='arl3'><span class="base"><b class="hw">free love</b></span></span>
+ </a>
+ </li>
+ </ul>
+ </div>
+ <a href="https://dictionary.cambridge.org/zhs/%E6%90%9C%E7%B4%A2/english/?q=love" class="txt-block"
+ title="在英语中关于love的所有意思"
+ onClick="ga('send','event', 'more-result', 'see-all-meaning' );">
+ <span>查看全部意思»</span> <i class="fcdo fcdo-angle-right" aria-hidden="true"></i>
+ </a>
+ </div>
+
+
+ <div class="tabs__content mod-more" data-tab="idioms" id="more-results-idioms">
+ <div class="pad">
+ <ul class="unstyled link-list results">
+ <li><a href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD/be-no-little-love-lost-between" title="be no/little love lost between idiom"><span class='arl7'><span class="base"><b class="phrase">be no/little love lost between</b></span> <span class="pos">idiom</span></span></a></li>
+ <li><a href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD/for-love-nor-money" title="for love nor money idiom"><span class='arl7'><span class="base"><b class="phrase">for love nor money</b></span> <span class="pos">idiom</span></span></a></li>
+ <li><a href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD/love-me-love-my-dog" title="love me, love my dog idiom"><span class='arl7'><span class="base"><b class="phrase">love me, love my dog</b></span> <span class="pos">idiom</span></span></a></li>
+ <li><a href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD/love-sb-to-bits" title="love sb to bits idiom"><span class='arl7'><span class="base"><b class="phrase">love <obj title="sb: abbreviation for somebody.">sb</obj> to bits</b></span> <span class="pos">idiom</span></span></a></li>
+ <li><a href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD/make-love-to-sb" title="make love to sb idiom"><span class='arl7'><span class="base"><b class="phrase">make love to <obj title="sb: abbreviation for somebody.">sb</obj></b></span> <span class="pos">idiom</span></span></a></li>
+ <li><a href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD/make-love" title="make love idiom"><span class='arl7'><span class="base"><b class="phrase">make love</b></span> <span class="pos">idiom</span></span></a></li>
+ <li><a href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD/young-love" title="young love idiom"><span class='arl7'><span class="base"><b class="phrase">young love</b></span> <span class="pos">idiom</span></span></a></li>
+ </ul>
+ </div>
+
+ <a href="https://dictionary.cambridge.org/zhs/%E6%90%9C%E7%B4%A2/english/?q=love&type=idiom" class="txt-block"
+ title="在英语中关于love的所有惯用语意思">
+ <span>查看全部惯用语意思»</span> <i class="fcdo fcdo-angle-right"></i>
+ </a>
+ </div>
+ </div>
</div>
@@ -2427,82 +2486,74 @@ <h2 class="h3 txt-block txt-block--alt round-top flush">
</script>
</div>
-
-<div class="mod mod--dark mod--style2 oflow-hide">
+ <div class="mod mod--dark mod--style2 oflow-hide">
<div class="pad">
- <p class="h2 semi-flush alt">Word of the Day</p>
- <p class="h4 feature-w-big wotd-hw">eyeliner</p><p>a coloured substance, usually contained in a pencil, that is put in a line just above or below the eyes in order to make them look more attractive</p>
+ <p class="h2 semi-flush alt">“每日一词”</p>
+ <p class="h4 feature-w-big wotd-hw">magical</p><p>produced by or using magic</p>
</div>
<div class="txt-block txt-block--alt with-icons js-eqh-sticky">
<div class="with-icons__content">
- <a href="https://dictionary.cambridge.org/dictionary/british/eyeliner" class="a--rev a--b">
- <span>About this</span> <i class="fcdo fcdo-angle-right" aria-hidden="true"></i>
+ <a href="https://dictionary.cambridge.org/zhs/%E8%AF%8D%E5%85%B8/%E8%8B%B1%E8%AF%AD/magical" class="a--rev a--b">
+ <span>关于这个</span> <i class="fcdo fcdo-angle-right" aria-hidden="true"></i>
</a>
</div>
<div class="with-icons__icons">
- <a class="circle circle-btn socialShareLink" title="Share this entry on Facebook" href='https://www.facebook.com/sharer.php?u=https%3A%2F%2Fdictionary.cambridge.org%2Fdictionary%2Fbritish%2Feyeliner&t=Word+of+the+Day' target='_blank' data-social='facebook' data-url='https://www.facebook.com/sharer.php?u=https%3A%2F%2Fdictionary.cambridge.org%2Fdictionary%2Fbritish%2Feyeliner&t=Word+of+the+Day' data-object='wotd'>
+ <a class="circle circle-btn socialShareLink" title="在Facebook上分享该词条" href='https://www.facebook.com/sharer.php?u=https%3A%2F%2Fdictionary.cambridge.org%2Fzhs%2F%25E8%25AF%258D%25E5%2585%25B8%2F%25E8%258B%25B1%25E8%25AF%25AD%2Fmagical&t=%E2%80%9C%E6%AF%8F%E6%97%A5%E4%B8%80%E8%AF%8D%E2%80%9D' target='_blank' data-social='facebook' data-url='https://www.facebook.com/sharer.php?u=https%3A%2F%2Fdictionary.cambridge.org%2Fzhs%2F%25E8%25AF%258D%25E5%2585%25B8%2F%25E8%258B%25B1%25E8%25AF%25AD%2Fmagical&t=%E2%80%9C%E6%AF%8F%E6%97%A5%E4%B8%80%E8%AF%8D%E2%80%9D' data-object='wotd'>
<i class="fcdo fcdo-facebook" aria-hidden="true"></i>
</a>
- <a class="circle circle-btn socialShareLink" title="Tweet this entry" href='https://twitter.com/intent/tweet?url=https%3A%2F%2Fdictionary.cambridge.org%2Fdictionary%2Fbritish%2Feyeliner' target='_blank' data-social='twitter' data-url='https://twitter.com/intent/tweet?url=https%3A%2F%2Fdictionary.cambridge.org%2Fdictionary%2Fbritish%2Feyeliner' data-object='wotd'>
+ <a class="circle circle-btn socialShareLink" title="用推特发送该词条" href='https://twitter.com/intent/tweet?url=https%3A%2F%2Fdictionary.cambridge.org%2Fzhs%2F%25E8%25AF%258D%25E5%2585%25B8%2F%25E8%258B%25B1%25E8%25AF%25AD%2Fmagical' target='_blank' data-social='twitter' data-url='https://twitter.com/intent/tweet?url=https%3A%2F%2Fdictionary.cambridge.org%2Fzhs%2F%25E8%25AF%258D%25E5%2585%25B8%2F%25E8%258B%25B1%25E8%25AF%25AD%2Fmagical' data-object='wotd'>
<i class="fcdo fcdo-twitter" aria-hidden="true"></i>
</a>
- <a class="circle circle-btn socialShareLink" title="Share this entry on Google+" href='https://plus.google.com/share?url=https%3A%2F%2Fdictionary.cambridge.org%2Fdictionary%2Fbritish%2Feyeliner' target='_blank' data-social='google' data-url='https://plus.google.com/share?url=https%3A%2F%2Fdictionary.cambridge.org%2Fdictionary%2Fbritish%2Feyeliner' data-object='wotd'>
+ <a class="circle circle-btn socialShareLink" title="在Google+上分享该词条" href='https://plus.google.com/share?url=https%3A%2F%2Fdictionary.cambridge.org%2Fzhs%2F%25E8%25AF%258D%25E5%2585%25B8%2F%25E8%258B%25B1%25E8%25AF%25AD%2Fmagical' target='_blank' data-social='google' data-url='https://plus.google.com/share?url=https%3A%2F%2Fdictionary.cambridge.org%2Fzhs%2F%25E8%25AF%258D%25E5%2585%25B8%2F%25E8%258B%25B1%25E8%25AF%25AD%2Fmagical' data-object='wotd'>
<i class="fcdo fcdo-google-plus" aria-hidden="true"></i>
</a>
-
-
- <a class="circle circle-btn socialShareLink" title="Share this entry on StumbleUpon" href='https://www.stumbleupon.com/likecontent?url=https%3A%2F%2Fdictionary.cambridge.org%2Fdictionary%2Fbritish%2Feyeliner' target='_blank' data-social='stumbleupon' data-url='https://www.stumbleupon.com/likecontent?url=https%3A%2F%2Fdictionary.cambridge.org%2Fdictionary%2Fbritish%2Feyeliner' data-object='wotd'>
- <i class="fcdo fcdo-stumbleupon" aria-hidden="true"></i>
- </a>
</div>
</div>
</div>
<div class="cols cols--half">
-
-<div class="cols__col" >
+ <div class=" 'cols__col' " >
<div class="mod mod--border">
- <a href="https://dictionaryblog.cambridge.org/2018/05/23/out-of-the-blue-words-and-phrases-for-unexpected-events/" target="_blank" class="img">
- <img alt="Out of the blue (Words and phrases for unexpected events)" src="/rss/images/out-of-the-blue.jpg" />
+ <a href="https://dictionaryblog.cambridge.org/2018/12/19/do-help-yourself-the-language-of-party-food/" target="_blank" class="img">
+ <img alt="Do help yourself! (The language of party food)" src="/zhs/rss/images/help-yourself.jpg" />
</a>
<div class="pad">
- <p class="h2 semi-flush">Blog</p>
+ <p class="h2 semi-flush">博客</p>
<p class="leader semi-flush">
- <a href="https://dictionaryblog.cambridge.org/2018/05/23/out-of-the-blue-words-and-phrases-for-unexpected-events/" class="a--alt a--rev" target="_blank">Out of the blue (Words and phrases for unexpected events)</a>
+ <a href="https://dictionaryblog.cambridge.org/2018/12/19/do-help-yourself-the-language-of-party-food/" class="a--alt a--rev" target="_blank">Do help yourself! (The language of party food)</a>
</p>
<p class="meta">
<small class="smaller">
- <time>May 23, 2018</time>
+ <time>December 19, 2018</time>
</small>
</p>
</div>
- <a href="https://dictionaryblog.cambridge.org/2018/05/23/out-of-the-blue-words-and-phrases-for-unexpected-events/" target="_blank" class="txt-block a--alt"><span>Read More</span> <i class="fcdo fcdo-angle-right"></i></a>
+ <a href="https://dictionaryblog.cambridge.org/2018/12/19/do-help-yourself-the-language-of-party-food/" target="_blank" class="txt-block a--alt"><span>查看更多</span> <i class="fcdo fcdo-angle-right"></i></a>
</div>
</div>
-
-<div class="cols__col" >
+ <div class=" 'cols__col' " >
<div class="mod mod--dark mod--border mod--style3">
- <a href="https://dictionaryblog.cambridge.org/2018/05/21/new-words-21-may-2018/" target="_blank" class="img">
- <img alt="monkey dumpling noun" src="/rss/images/monkey-dumpling.jpg" />
+ <a href="https://dictionaryblog.cambridge.org/2018/12/17/new-words-17-december-2018/" target="_blank" class="img">
+ <img alt="social jetlag noun" src="/zhs/rss/images/social-jetlag.jpg" />
</a>
<div class="pad">
- <p class="h2 alt semi-flush">New Words</p>
+ <p class="h2 alt semi-flush">新词</p>
<p class="h4 feature-w semi-flush nw-hw">
- <a href="https://dictionaryblog.cambridge.org/2018/05/21/new-words-21-may-2018/" class="a--alt a--rev" target="_blank">monkey dumpling noun</a>
+ <a href="https://dictionaryblog.cambridge.org/2018/12/17/new-words-17-december-2018/" class="a--alt a--rev" target="_blank">social jetlag noun</a>
</p>
<p>
- <small class="smaller"><time>May 21, 2018</time></small>
+ <small class="smaller"><time>December 17, 2018</time></small>
</p>
</div>
- <a href="https://dictionaryblog.cambridge.org/2018/05/21/new-words-21-may-2018/" target="_blank" class="txt-block txt-block--alt js-eqh-sticky">
- <span>More new words</span> <i class="fcdo fcdo-angle-right"></i>
+ <a href="https://dictionaryblog.cambridge.org/2018/12/17/new-words-17-december-2018/" target="_blank" class="txt-block txt-block--alt js-eqh-sticky">
+ <span>查看更多</span> <i class="fcdo fcdo-angle-right"></i>
</a>
</div>
</div>
@@ -2513,19 +2564,20 @@ <h2 class="h3 txt-block txt-block--alt round-top flush">
var aEvt = [];
var evtCall = evtCall || [];
- evtCall.push(function(){ga('send','event', 'Channelization', 'people_society_religion_disliking', 'not-liking', {'nonInteraction':1})});
+
+ evtCall.push(function(){ga('send','event', 'Channelization', 'people_society_religion_disliking', 'not-liking',{'nonInteraction':1})});
aEvt.push("Channelization.people_society_religion.disliking.not-liking");
- evtCall.push(function(){ga('send','event', 'Channelization', 'people_society_religion_liking-and-attractiveness', 'liking', {'nonInteraction':1})});
+ evtCall.push(function(){ga('send','event', 'Channelization', 'people_society_religion_liking-and-attractiveness', 'liking',{'nonInteraction':1})});
aEvt.push("Channelization.people_society_religion.liking-and-attractiveness.liking");
- evtCall.push(function(){ga('send','event', 'Channelization', 'people_society_religion_liking-and-attractiveness', 'loving-and-in-love', {'nonInteraction':1})});
+ evtCall.push(function(){ga('send','event', 'Channelization', 'people_society_religion_liking-and-attractiveness', 'loving-and-in-love',{'nonInteraction':1})});
aEvt.push("Channelization.people_society_religion.liking-and-attractiveness.loving-and-in-love");
- evtCall.push(function(){ga('send','event', 'Channelization', 'people_society_religion_communication', 'written-greetings', {'nonInteraction':1})});
+ evtCall.push(function(){ga('send','event', 'Channelization', 'people_society_religion_communication', 'written-greetings',{'nonInteraction':1})});
aEvt.push("Channelization.people_society_religion.communication.written-greetings");
- evtCall.push(function(){ga('send','event', 'Channelization', 'sports_sporting_goods_sports', 'tennis-and-racket-sports', {'nonInteraction':1})});
+ evtCall.push(function(){ga('send','event', 'Channelization', 'sports_sporting_goods_sports', 'tennis-and-racket-sports',{'nonInteraction':1})});
aEvt.push("Channelization.sports_sporting_goods.sports.tennis-and-racket-sports");
- evtCall.push(function(){ga('send','event', 'Channelization', 'arts_entertainment_media_chance-and-possibility', 'unachievable', {'nonInteraction':1})});
+ evtCall.push(function(){ga('send','event', 'Channelization', 'arts_entertainment_media_chance-and-possibility', 'unachievable',{'nonInteraction':1})});
aEvt.push("Channelization.arts_entertainment_media.chance-and-possibility.unachievable");
- evtCall.push(function(){ga('send','event', 'Channelization', 'shopping_consumer_resources_wanting', 'wanting-things', {'nonInteraction':1})});
+ evtCall.push(function(){ga('send','event', 'Channelization', 'shopping_consumer_resources_wanting', 'wanting-things',{'nonInteraction':1})});
aEvt.push("Channelization.shopping_consumer_resources.wanting.wanting-things");
_qevents.push({
qacct:"p-cfSla1Cke_iBQ",
@@ -2533,143 +2585,102 @@ <h2 class="h3 txt-block txt-block--alt round-top flush">
});
</script>
-<script type="text/javascript">
- var anchor = "";
-</script>
</div>
</article>
</div>
- <div class="modal modal--myd js-modal" id="modal-login">
-
- <div class="modal__main">
- <div class="modal__spacer">
- <div class="h1 center">Log in to My Dictionary</div>
- <br />
- <p>
- <a href='https://dictionary.cambridge.org/auth/socialauth?id=facebook&url=https%3A%2F%2Fdictionary.cambridge.org%2Fdictionary%2Fenglish%2Flove' class="btn btn--social bg--fb">
- <i class="fcdo fcdo-facebook" aria-hidden="true"></i> Log in with Facebook </a>
- <br />
- <a href='https://dictionary.cambridge.org/auth/socialauth?id=googleplus&url=https%3A%2F%2Fdictionary.cambridge.org%2Fdictionary%2Fenglish%2Flove' class="btn btn--social btn--right bg--gp">
- <i class="fcdo fcdo-google-plus" aria-hidden="true"></i> Log in with Google+ </a>
- </p>
- </div>
- </div>
-
- <div class="modal__sidebar">
- <div class="modal__spacer">
- <div class="h2 pad-t">Why Sign Up?</div>
- <ul class="checklist">
- <li>It's free!</li>
- <li>Build your own word lists</li>
- <li>Create quizzes</li>
- <li>Save favourites</li>
- <li>Share with friends</li>
- <li>Personalise your My Dictionary space</li>
- </ul>
- </div>
-
- </div>
- <span class="modal__close js-toggle" data-target-selector="#modal-login">
- <i class="fcdo fcdo-close"></i>
- </span>
-
-</div>
-<div class="cdo-promo">
+ <div class="cdo-promo">
<div class="contain">
<div class="cols">
- <div class="cols__col spr-b spr--promo-search">
- <a href="https://dictionary.cambridge.org/toolbardictionary.html" title="Search from your browser">
- <span class="h4">Search from your browser</span>
- <p>Add Cambridge Dictionary to your browser in a click!</p>
- </a>
- </div>
-
- <div class="cols__col spr-b spr--promo-widget">
- <a href="https://dictionary.cambridge.org/freesearch.html" title="Get our free widgets">
- <span class="h4">Get our free widgets</span>
- <p>Add the power of Cambridge Dictionary to your website using our free search box widgets.</p>
+ <div class="cols__col spr-b spr--promo-widget">
+ <a href="https://dictionary.cambridge.org/zhs/freesearch.html" title="获得我们的免费小工具">
+ <span class="h4">获得我们的免费小工具</span>
+ <p>使用我们的免费搜索框部件来添加剑桥词典到您的网站。</p>
</a>
</div>
<div class="cols__col spr-b spr--promo-apps">
- <a href="http://www.cambridgemobileapps.com/" rel="external" title="Dictionary apps">
- <span class="h4">Dictionary apps</span>
- <p>Browse our dictionary apps today and ensure you are never again lost for words.</p>
+ <a href="http://www.cambridgemobileapps.com/" rel="external" title="词典应用程序">
+ <span class="h4">词典应用程序</span>
+ <p>今天就浏览我们的词典应用程序，确保您不会丢失词汇。</p>
</a>
</div>
</div>
</div>
</div>
+
+<script>
+ var gigyaAuthEnabled = true;
+ var thresholdPublic = 5;
+</script>
+
<footer id="footer" class="ftr clr">
<div class="contain">
<div class="ftr__nav">
<nav>
<ul class="cols unstyled unstyled-nest ftr__links">
<li class="cols__col">
- <a href="https://dictionary.cambridge.org/learn.html" class="ico-bg-abs js-accord" data-js-maxwidth="600">Learn</a>
+ <a href="https://dictionary.cambridge.org/zhs/learn.html" class="ico-bg-abs js-accord" data-js-maxwidth="600">学习</a>
<ul>
- <li class="resp-hide--sml"><a href="https://dictionary.cambridge.org/learn.html">Learn</a></li>
- <li><a href="https://dictionaryblog.cambridge.org/category/new-words/" target="_blank">New Words</a></li>
- <li><a href="https://dictionary.cambridge.org/help/">Help</a></li>
- <li><a href="http://www.cambridge.org/gb/cambridgeenglish/catalog/dictionaries" target="_blank">In Print</a></li>
+ <li class="resp-hide--sml"><a href="https://dictionary.cambridge.org/zhs/learn.html">学习</a></li>
+ <li><a href="https://dictionaryblog.cambridge.org/category/new-words/" target="_blank">新词</a></li>
+ <li><a href="https://dictionary.cambridge.org/zhs/help/">帮助</a></li>
+ <li><a href="http://www.cambridge.org/gb/cambridgeenglish/catalog/dictionaries" target="_blank">纸质书出版</a></li>
</ul>
</li>
<li class="cols__col">
- <a href="https://dictionary.cambridge.org/develop.html" class="ico-bg-abs js-accord" data-js-maxwidth="600">Develop</a>
+ <a href="https://dictionary.cambridge.org/zhs/develop.html" class="ico-bg-abs js-accord" data-js-maxwidth="600">开发</a>
<ul>
- <li class="resp-hide--sml"><a href="https://dictionary.cambridge.org/develop.html">Develop</a></li>
- <li><a href="http://dictionary-api.cambridge.org/" target="_blank">Dictionary API</a></li>
- <li><a href="https://dictionary.cambridge.org/doubleclick.html">Double-Click Lookup</a></li>
- <li><a href="https://dictionary.cambridge.org/freesearch.html">Search Widgets</a></li>
- <li><a href="https://dictionary.cambridge.org/license.html">License Data</a></li>
+ <li class="resp-hide--sml"><a href="https://dictionary.cambridge.org/zhs/develop.html">开发</a></li>
+ <li><a href="http://dictionary-api.cambridge.org/" target="_blank">词典API</a></li>
+ <li><a href="https://dictionary.cambridge.org/zhs/doubleclick.html">双击查看</a></li>
+ <li><a href="https://dictionary.cambridge.org/zhs/freesearch.html">搜索Widgets</a></li>
+ <li><a href="https://dictionary.cambridge.org/zhs/license.html">执照数据</a></li>
</ul>
</li>
<li class="cols__col">
- <a href="https://dictionary.cambridge.org/about.html" class="ico-bg-abs js-accord" data-js-maxwidth="600">About</a>
+ <a href="https://dictionary.cambridge.org/zhs/about.html" class="ico-bg-abs js-accord" data-js-maxwidth="600">关于</a>
<ul>
- <li class="resp-hide--sml"><a href="https://dictionary.cambridge.org/about.html">About</a></li>
- <li><a href="http://www.cambridge.org/policy/accessibility/" target="_blank">Accessibility</a></li>
- <li><a href="http://www.cambridge.org/us/cambridgeenglish" target="_blank">Cambridge English</a></li>
- <li><a href="http://www.cambridge.org/" target="_blank">Cambridge University Press</a></li>
- <li><a href="http://www.cambridge.org/policy/dictionary_privacy" target="_blank">Cookies and Privacy</a></li>
- <li><a href="http://www.cambridge.org/elt/corpus/" target="_blank">Corpus</a></li>
- <li><a href="http://www.cambridge.org/about-us/terms-use/" target="_blank">Terms of Use</a></li>
- </ul>
+ <li class="resp-hide--sml"><a href="https://dictionary.cambridge.org/zhs/about.html">关于</a></li>
+ <li><a href="http://www.cambridge.org/policy/accessibility/" target="_blank">便利性</a></li>
+ <li><a href="http://www.cambridge.org/us/cambridgeenglish" target="_blank">剑桥英语教学</a></li>
+ <li><a href="http://www.cambridge.org/" target="_blank">剑桥大学出版社</a></li>
+ <li><a href="http://www.cambridge.org/policy/dictionary_privacy" target="_blank">Cookies与隐私保护</a></li>
+ <li><a href="http://www.cambridge.org/elt/corpus/" target="_blank">语料库</a></li>
+ <li><a href="http://www.cambridge.org/about-us/terms-use/" target="_blank">使用条款</a></li>
+ <li><a href="http://www.miibeian.gov.cn/" target="_blank">京ICP备14002226号-2</a></li> </ul>
</li>
</ul>
</nav>
</div>
<div class="ftr__follow">
- <a href="https://www.facebook.com/home.php?#!/pages/Cambridge-Dictionaries-Online/118775618133878" class="btnfeat btnfeat--fb" rel="external" target="_blank" title="Become our fan!">
+ <a href="https://www.facebook.com/home.php?#!/pages/Cambridge-Dictionaries-Online/118775618133878" class="btnfeat btnfeat--fb" rel="external" target="_blank" title="成为我们的粉丝！">
<i class="fcdo fcdo-facebook" aria-hidden="true"></i>
<span>2.34 m</span>
- <em>Likes</em>
+ <em>赞</em>
<span class="point"></span>
</a>
- <a href="https://twitter.com/CambridgeWords" class="btnfeat btnfeat--tw" rel="external" target="_blank" title="Follow us!">
+ <a href="https://twitter.com/CambridgeWords" class="btnfeat btnfeat--tw" rel="external" target="_blank" title="关注我们！">
<i class="fcdo fcdo-twitter" aria-hidden="true"></i>
- <span>161 k</span>
- <em>Followers</em>
+ <span>173 k</span>
+ <em>关注</em>
<span class="point"></span>
</a>
- <a href="https://plus.google.com/b/108790671280639180398" class="btnfeat btnfeat--gp" rel="external" target="_blank" title="Circle us!">
+ <a href="https://plus.google.com/+cambridgedictionary" class="btnfeat btnfeat--gp" rel="external" target="_blank" title="分享我们！">
<i class="fcdo fcdo-google-plus" aria-hidden="true"></i>
- <span>13.2 k</span>
- <em>Fans</em>
+ <span>15.3 k</span>
+ <em>粉丝</em>
<span class="point"></span>
</a>
</div>
<div class="ftr__copy">
<a class="spr spr--logo-ftr" href="http://www.cambridge.org" rel="external"></a>
- <p>© Cambridge University Press 2018</p>
+ <p>©剑桥大学出版社2018</p>
</div>
</div>
</footer>
-
-
<div class="overlay js-overlay"></div>
<ul class="unstyled notification banner"></ul>
@@ -2709,15 +2720,14 @@ <h2 class="h3 txt-block txt-block--alt round-top flush">
&noscript=1"/>
</noscript>
<!-- End Facebook Pixel Code -->
- <script type="text/javascript" src="/notification/notifications.js?version=3.1.126&url=%2Fdictionary%2Fenglish%2Flove"></script>
- <script type="text/javascript" src="/common.js?version=3.1.126"></script>
+ <script>var NOTIFICATION_COOKIE = "notifications";var notifications = [];</script>
+ <script type="text/javascript" src="/zhs/common.js?version=4.0.64"></script>
<script type='text/javascript'>
var aBk = true;
</script>
-<script type='text/javascript' src="/ads.min.js?version=3.1.126" ></script>
-
+<script type='text/javascript' src="/zhs/external/scripts/ads.min.js?version=4.0.64" ></script>
<script type='text/javascript'>
ga('send','event','aBk','aBk',''+aBk,{'nonInteraction':1});
@@ -2734,13 +2744,13 @@ <h2 class="h3 txt-block txt-block--alt round-top flush">
_ddtag.cmd=function(){
var values=[];
- values['lang'] = "br";
+ values['lang'] = "zh_CN";
values['page_cat'] = "dictionary";
- values['page_type'] = "entryex";
+ values['page_type'] = "entry";
values['entry_id'] = "love";
values['dict_code'] = "english";
values['google_channels'] = "people_society_religion|sports_sporting_goods|arts_entertainment_media|shopping_consumer_resources";
- values['channels'] = "liking|tennis-and-racket-sports|loving-and-in-love|wanting-things|written-greetings|unachievable|not-liking";
+ values['channels'] = "liking|tennis-and-racket-sports|loving-and-in-love|unachievable|written-greetings|wanting-things|not-liking";
values['topic'] = "liking-and-attractiveness";
values['aBk'] = aBk;
@@ -2762,5 +2772,6 @@ <h2 class="h3 txt-block txt-block--alt round-top flush">
}
})();
</script>
- </body>
+ <script type="text/javascript" async="async" src="https://cdns.eu1.gigya.com/js/gigya.js?apiKey=3_1Rly-IzDTFvKO75hiQQbkpInsqcVx6RBnqVUozkm1OVH_QRzS-xI3Cwj7qq7hWv5"></script>
+ </body>
</html>
|
test
|
update source pages
|
227089c8f713b32bafd512a74c5423ea0a7b5673
|
2020-06-04 08:51:09
|
crimx
|
fix(sync-services): fix anki returning random order of field names
| false
|
diff --git a/src/_locales/en/options.ts b/src/_locales/en/options.ts
index afc545fab..8a33401bf 100644
--- a/src/_locales/en/options.ts
+++ b/src/_locales/en/options.ts
@@ -305,10 +305,10 @@ export const locale: typeof _locale = {
'Optional key can be added in Anki Connect config for identification.',
deckName: 'Deck',
deckName_help:
- 'If deck does not exist you can generate a default one automatically by clicking "Verify Anki Connect" below, or manage in manually Anki.',
+ 'If deck does not exist you can generate a default one automatically by clicking "Verify Anki Connect" below.',
noteType: 'Note Type',
noteType_help:
- 'Anki note type includes a set of fields and card type. If note type does not exist you can generate a default one automatically by clicking "Verify Anki Connect" below, or manage in manually Anki.',
+ 'Anki note type includes a set of fields and card type. If note type does not exist you can generate a default one automatically by clicking "Verify Anki Connect" below. DO NOT change fieled names when editing or adding card templates in Anki',
tags: 'Tags',
tags_help: 'Anki notes can include tags separated with commas.',
escapeHTML: 'Escape HTML',
diff --git a/src/_locales/zh-CN/options.ts b/src/_locales/zh-CN/options.ts
index 0411f7abc..11b2cdaa7 100644
--- a/src/_locales/zh-CN/options.ts
+++ b/src/_locales/zh-CN/options.ts
@@ -289,10 +289,10 @@ export const locale = {
key_help: '可在 Anki Connect 插件中设置 key 以做简单令牌。',
deckName: '牌组',
deckName_help:
- '如果不存在的话可以点下方「检查 Anki Connect」让本设置生成默认牌组。也可以自行在 Anki 中管理。',
+ '如果不存在的话可以点下方「检查 Anki Connect」让本设置生成默认牌组。',
noteType: '笔记类型',
noteType_help:
- 'Anki 笔记类型包括一套字段和卡片类型。如果不存在的话可以点下方「检查 Anki Connect」让本设置生成一套默认的笔记类型。也可以自行在 Anki 中管理。',
+ 'Anki 笔记类型包括一套字段和卡片类型。如果不存在的话可以点下方「检查 Anki Connect」让本设置生成一套默认的笔记类型。如需自行在 Anki 添加或修改卡片模板请不要更改字段名字。',
tags: '标签',
tags_help: 'Anki 笔记可以附带标签。以逗号分割。',
escapeHTML: '转义 HTML',
diff --git a/src/_locales/zh-TW/options.ts b/src/_locales/zh-TW/options.ts
index cf019b199..096437b37 100644
--- a/src/_locales/zh-TW/options.ts
+++ b/src/_locales/zh-TW/options.ts
@@ -293,10 +293,10 @@ export const locale: typeof _locale = {
key_help: '可在 Anki Connect 外掛中設定 key 以做簡單令牌。',
deckName: '牌組',
deckName_help:
- '如果不存在的話可以點下方「檢查 Anki Connect」讓本設定生成預設牌組。也可以自行在 Anki 中管理。',
+ '如果不存在的話可以點下方「檢查 Anki Connect」讓本設定生成預設牌組。',
noteType: '筆記型別',
noteType_help:
- 'Anki 筆記型別包括一套欄位和卡片型別。如果不存在的話可以點下方「檢查 Anki Connect」讓本設定生成一套預設的筆記型別。也可以自行在 Anki 中管理。',
+ 'Anki 筆記型別包括一套欄位和卡片型別。如果不存在的話可以點下方「檢查 Anki Connect」讓本設定生成一套預設的筆記型別。如需自行在 Anki 新增或修改卡片模板請不要更改欄位名字。',
tags: '標籤',
tags_help: 'Anki 筆記可以附帶標籤。以逗號分割。',
escapeHTML: '轉義 HTML',
diff --git a/src/background/sync-manager/services/ankiconnect/index.ts b/src/background/sync-manager/services/ankiconnect/index.ts
index 411e8d6e0..b748f6eaf 100644
--- a/src/background/sync-manager/services/ankiconnect/index.ts
+++ b/src/background/sync-manager/services/ankiconnect/index.ts
@@ -150,21 +150,21 @@ export class Service extends SyncService<SyncConfig> {
async addNoteType() {
this.noteFileds = [
- 'Date',
- 'Text',
- 'Translation',
- 'Context',
- 'ContextCloze',
- 'Note',
- 'Title',
- 'Url',
- 'Favicon',
- 'Audio'
+ 'Date.',
+ 'Text.',
+ 'Translation.',
+ 'Context.',
+ 'ContextCloze.',
+ 'Note.',
+ 'Title.',
+ 'Url.',
+ 'Favicon.',
+ 'Audio.'
]
await this.request('createModel', {
modelName: this.config.noteType,
- inOrderFields: [...this.noteFileds],
+ inOrderFields: this.noteFileds,
css: cardCss(),
cardTemplates: [
{
@@ -246,9 +246,49 @@ export class Service extends SyncService<SyncConfig> {
}
async getNotefields(): Promise<string[]> {
- return this.request<string[]>('modelFieldNames', {
+ const nf = await this.request<string[]>('modelFieldNames', {
modelName: this.config.noteType
})
+
+ // Anki connect bug
+ return nf?.includes('Date')
+ ? [
+ 'Date',
+ 'Text',
+ 'Translation',
+ 'Context',
+ 'ContextCloze',
+ 'Note',
+ 'Title',
+ 'Url',
+ 'Favicon',
+ 'Audio'
+ ]
+ : nf?.includes('日期')
+ ? [
+ '日期',
+ '文字',
+ 'Translation',
+ 'Context',
+ 'ContextCloze',
+ '笔记',
+ 'Title',
+ 'Url',
+ 'Favicon',
+ 'Audio'
+ ]
+ : [
+ 'Date.',
+ 'Text.',
+ 'Translation.',
+ 'Context.',
+ 'ContextCloze.',
+ 'Note.',
+ 'Title.',
+ 'Url.',
+ 'Favicon.',
+ 'Audio.'
+ ]
}
multiline(text: string, escape: boolean): string {
@@ -388,5 +428,20 @@ height: .7em;
.tsource a {
text-decoration: none;
}
+
+.typeGood {
+ color: #fff;
+ background: #1EBC61;
+}
+
+.typeBad {
+ color: #fff;
+ background: #F75C4C;
+}
+
+.typeMissed {
+ color: #fff;
+ background: #7C8A99;
+}
`
}
|
fix
|
fix anki returning random order of field names
|
ef91fd5a9359612f8cf551fb92b7aa7095811520
|
2019-01-21 23:08:13
|
CRIMX
|
refactor(options): abstract sortable list
| false
|
diff --git a/src/options/_style.scss b/src/options/_style.scss
index 8c93d613a..9946f121f 100644
--- a/src/options/_style.scss
+++ b/src/options/_style.scss
@@ -1,102 +1,142 @@
-/* ========================================================================= *\
- * 快捷键 <kbd>
- \* ========================================================================= */
-
- kbd {
- position: relative;
- top: -0.3em;
- display: inline-block;
- padding: .25em .5em .2em;
- margin-left: .25em;
- margin-right: .25em;
- font: 75%/1 monaco, menlo, consolas, 'courier new', courier, monospace;
- border: solid 1px #ccc;
- border-bottom-color: #bbb;
- border-radius: 3px;
- white-space: nowrap;
- word-wrap: normal;
- text-transform: capitalize; // 首字母大写
-
- color: #555;
- background-color: #fefefe;
- background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0.05), rgba(0, 0, 0, 0));
- box-shadow: 0 2px 0 #ccc, 0 3px 1px #999, inset 0 1px 1px #fff;
- }
-
- .dark kbd,
- kbd.dark {
- color: #fdfdfd;
- text-shadow: 0 -1px 0 #000;
- border-color: #000;
- background-color: #4d4c4c;
- background-image: linear-gradient(rgba(0, 0, 0, 0.5), rgba(0, 0, 0, 0) 80%, rgba(0, 0, 0, 0));
- box-shadow: 0 2px 0 #000, 0 3px 1px #999, inset 0 1px 1px #aaa, inset 0 -1px 3px #272727;
- }
-
- kbd kbd {
- padding: 0;
- font-size: 100%;
- font-weight: bold;
- box-shadow: none;
- }
-
-
- // Mac 修饰键符号
- // https://support.apple.com/kb/PH10564?locale=zh_CN
- // [Mac——如何输入⌘、⌥、⇧、⌃、⎋等特殊字符](http://softu.cn/447)
-
- kbd[data-key]:after {
- font-family: 'Myriad Set Pro', 'Helvetica Neue', 'Helvetica', 'Arial', 'Verdana', 'sans-serif';
- }
-
- kbd[data-key='command']:after {
- content: ' ⌘';
- }
-
- kbd[data-key='cmd']:after {
- content: ' ⌘';
- }
-
- kbd[data-key='shift']:after {
- content: ' ⇧';
- }
-
- kbd[data-key='control']:after {
- content: ' ⌃';
- }
-
- kbd[data-key='option']:after {
- content: ' ⌥';
- }
-
- kbd[data-key='capslock']:after {
- content: ' ⇪';
- }
-
- kbd[data-key='caps lock']:after {
- content: ' ⇪';
- }
-
- kbd[data-key='escape']:after {
- content: ' ⎋';
- }
-
- kbd[data-key='esc']:after {
- content: ' ⎋';
- }
-
- kbd[data-key='return']:after {
- content: ' ↩';
- }
-
- kbd[data-key='enter']:after {
- content: ' ↩';
- }
-
- kbd[data-key='delete']:after {
- content: ' ⌫';
- }
-
- kbd[data-key='eject']:after {
- content: ' ⏏';
- }
+/* ======================================= *\
+ * Antd Patch
+\* ======================================= */
+
+body {
+ background: #f0f2f5;
+}
+
+.form-item-inline {
+ display: inline-block !important;
+ margin: 0 10px 0 0 !important;
+
+ &:last-of-type {
+ margin-right: 0 !important;
+ }
+}
+
+/* ======================================= *\
+ * Sortable List Patch
+\* ======================================= */
+
+.sortable-list-item {
+ width: 100% !important;
+ display: flex !important;
+ justify-content: space-between !important;
+ align-items: center !important;
+}
+
+.sortable-list-radio-group {
+ display: block !important;
+ margin-bottom: 10 !important;
+}
+
+.sortable-list-item-btn {
+ margin-left: 10px !important;
+ padding: 0 !important;
+ line-height: 1 !important;
+ border: none !important;
+}
+
+/* ======================================= *\
+ * 快捷键 <kbd>
+\* ======================================= */
+
+kbd {
+ position: relative;
+ top: -0.3em;
+ display: inline-block;
+ padding: .25em .5em .2em;
+ margin-left: .25em;
+ margin-right: .25em;
+ font: 75%/1 monaco, menlo, consolas, 'courier new', courier, monospace;
+ border: solid 1px #ccc;
+ border-bottom-color: #bbb;
+ border-radius: 3px;
+ white-space: nowrap;
+ word-wrap: normal;
+ text-transform: capitalize; // 首字母大写
+
+ color: #555;
+ background-color: #fefefe;
+ background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0.05), rgba(0, 0, 0, 0));
+ box-shadow: 0 2px 0 #ccc, 0 3px 1px #999, inset 0 1px 1px #fff;
+}
+
+.dark kbd,
+kbd.dark {
+ color: #fdfdfd;
+ text-shadow: 0 -1px 0 #000;
+ border-color: #000;
+ background-color: #4d4c4c;
+ background-image: linear-gradient(rgba(0, 0, 0, 0.5), rgba(0, 0, 0, 0) 80%, rgba(0, 0, 0, 0));
+ box-shadow: 0 2px 0 #000, 0 3px 1px #999, inset 0 1px 1px #aaa, inset 0 -1px 3px #272727;
+}
+
+kbd kbd {
+ padding: 0;
+ font-size: 100%;
+ font-weight: bold;
+ box-shadow: none;
+}
+
+
+// Mac 修饰键符号
+// https://support.apple.com/kb/PH10564?locale=zh_CN
+// [Mac——如何输入⌘、⌥、⇧、⌃、⎋等特殊字符](http://softu.cn/447)
+
+kbd[data-key]:after {
+ font-family: 'Myriad Set Pro', 'Helvetica Neue', 'Helvetica', 'Arial', 'Verdana', 'sans-serif';
+}
+
+kbd[data-key='command']:after {
+ content: ' ⌘';
+}
+
+kbd[data-key='cmd']:after {
+ content: ' ⌘';
+}
+
+kbd[data-key='shift']:after {
+ content: ' ⇧';
+}
+
+kbd[data-key='control']:after {
+ content: ' ⌃';
+}
+
+kbd[data-key='option']:after {
+ content: ' ⌥';
+}
+
+kbd[data-key='capslock']:after {
+ content: ' ⇪';
+}
+
+kbd[data-key='caps lock']:after {
+ content: ' ⇪';
+}
+
+kbd[data-key='escape']:after {
+ content: ' ⎋';
+}
+
+kbd[data-key='esc']:after {
+ content: ' ⎋';
+}
+
+kbd[data-key='return']:after {
+ content: ' ↩';
+}
+
+kbd[data-key='enter']:after {
+ content: ' ↩';
+}
+
+kbd[data-key='delete']:after {
+ content: ' ⌫';
+}
+
+kbd[data-key='eject']:after {
+ content: ' ⏏';
+}
diff --git a/src/options/components/SortableList.tsx b/src/options/components/SortableList.tsx
new file mode 100644
index 000000000..522293e5c
--- /dev/null
+++ b/src/options/components/SortableList.tsx
@@ -0,0 +1,125 @@
+import React from 'react'
+import { TranslationFunction } from 'i18next'
+import { SortableContainer, SortableHandle, SortableElement, SortEnd } from 'react-sortable-hoc'
+import { Icon, List, Radio, Button, Card } from 'antd'
+import { RadioChangeEvent } from 'antd/lib/radio'
+import { Omit } from '@/typings/helpers'
+
+export type SortableListItem = { value: string, title: React.ReactNode }
+
+export interface SortableListItemProps {
+ t: TranslationFunction
+ indexCopy: number
+ selected?: string
+ item: SortableListItem
+ onEdit?: (index: number, item: SortableListItem) => void
+ onDelete?: (index: number, item: SortableListItem) => void
+}
+
+export interface SortableListProps extends Omit<
+ SortableListItemProps, 'item' | 'indexCopy'
+> {
+ t: TranslationFunction
+ /** List title */
+ title: React.ReactNode
+ description?: React.ReactNode
+ list: SortableListItem[]
+ /** List Item can be selected */
+ selected?: string
+ /** show add button */
+ isShowAdd?: boolean
+ onAdd?: () => void
+ /** Title being selected */
+ onSelect?: (e: RadioChangeEvent) => void
+ onSortEnd?: (end: SortEnd) => void
+}
+
+const DragHandle = SortableHandle<{
+ t: TranslationFunction
+}>(({ t }) => (
+ <Icon
+ title={t('common:sort')}
+ style={{ cursor: 'move' }}
+ type='bars'
+ />
+))
+
+const ProfileListItem = SortableElement<SortableListItemProps>(({
+ t, selected, item, onEdit, onDelete, indexCopy
+}) => {
+ return (
+ <List.Item>
+ <div className='sortable-list-item'>
+ {selected == null
+ ? item.title
+ : <Radio value={item.value}>{item.title}</Radio>
+ }
+ <div>
+ <DragHandle t={t} />
+ <Button
+ className='sortable-list-item-btn'
+ title={t('common:edit')}
+ shape='circle'
+ size='small'
+ icon='edit'
+ onClick={onEdit && (() => onEdit(indexCopy, item))}
+ />
+ <Button
+ title={t('common:delete')}
+ className='sortable-list-item-btn'
+ shape='circle'
+ size='small'
+ icon='close'
+ disabled={selected != null && item.value === selected}
+ onClick={onDelete && (() => onDelete(indexCopy, item))}
+ />
+ </div>
+ </div>
+ </List.Item>
+ )
+})
+
+export const SortableListContainer = SortableContainer<SortableListProps>(props => (
+ <List
+ size='large'
+ dataSource={props.list}
+ renderItem={(item: any, index: number) => (
+ <ProfileListItem {...props} item={item} index={index} indexCopy={index} />
+ )}
+ />
+))
+
+export function SortableList (props: SortableListProps) {
+ return (
+ <Card
+ title={props.title}
+ extra={(
+ <Button type='dashed' size='small' onClick={props.onAdd}>
+ <Icon type='plus' />{props.t('common:add')}
+ </Button>
+ )}
+ >
+ <Radio.Group
+ className='sortable-list-radio-group'
+ value={props.selected}
+ onChange={props.onSelect}
+ >
+ <SortableListContainer
+ useDragHandle
+ {...props}
+ />
+ </Radio.Group>
+ {(props.isShowAdd == null || props.isShowAdd) &&
+ <Button
+ type='dashed'
+ style={{ width: '100%' }}
+ onClick={props.onAdd}
+ >
+ <Icon type='plus' /> {props.t('common:add')}
+ </Button>
+ }
+ </Card>
+ )
+}
+
+export default SortableList
|
refactor
|
abstract sortable list
|
969c0fc380658af73540f89542e188330d89923b
|
2019-08-20 11:51:31
|
crimx
|
refactor(content): re-structure redux
| false
|
diff --git a/src/content/redux/modules/action-catalog.ts b/src/content/redux/modules/action-catalog.ts
new file mode 100644
index 000000000..5f2b90bbb
--- /dev/null
+++ b/src/content/redux/modules/action-catalog.ts
@@ -0,0 +1,38 @@
+import { AppConfig, DictID } from '@/app-config'
+import { Profile } from '@/app-config/profiles'
+import { Message } from '@/typings/message'
+import { Word } from '@/_helpers/record-manager'
+
+export type ActionCatalog = {
+ NEW_CONFIG: {
+ payload: AppConfig
+ }
+ NEW_PROFILE: {
+ payload: Profile
+ }
+ NEW_SELECTION: {
+ payload: Message<'SELECTION'>['payload']
+ }
+ /** Click or hover on salad bowl */
+ BOWL_ACTIVATED: {}
+ SEARCH_END: {
+ payload: {
+ id: DictID
+ result: any
+ }
+ }
+ SEARCH_START: {
+ payload?: {
+ /** Search with specific dict */
+ id?: DictID
+ /** Search specific word */
+ word?: Word
+ /** Additional payload passed to search engine */
+ payload?: any
+ }
+ }
+ /** Is current word in Notebook */
+ WORD_IN_NOTEBOOK: {
+ payload: boolean
+ }
+}
diff --git a/src/content/redux/modules/config.ts b/src/content/redux/modules/config.ts
deleted file mode 100644
index 82b039b2d..000000000
--- a/src/content/redux/modules/config.ts
+++ /dev/null
@@ -1,44 +0,0 @@
-import { getDefaultConfig, AppConfig } from '@/app-config'
-import { getDefaultProfile, Profile } from '@/app-config/profiles'
-import { addConfigListener } from '@/_helpers/config-manager'
-import { addActiveProfileListener } from '@/_helpers/profile-manager'
-import { createReducer } from '../utils/createReducer'
-import { Init } from '../utils/types'
-
-export type ActionCatalog = {
- 'CONFIG/NEW_CONFIG': {
- payload: AppConfig
- }
- 'CONFIG/NEW_PROFILE': {
- payload: Profile
- }
-}
-export type State = typeof initState
-
-const initState = {
- config: getDefaultConfig(),
- activeProfile: getDefaultProfile()
-}
-
-export const reducer = createReducer<ActionCatalog, State>(initState, {
- 'CONFIG/NEW_CONFIG': (state, action) => ({
- ...state,
- config: action.payload
- }),
- 'CONFIG/NEW_PROFILE': (state, action) => ({
- ...state,
- activeProfile: action.payload
- })
-})
-
-export default reducer
-
-export const init: Init<ActionCatalog> = dispatch => {
- addConfigListener(({ newConfig }) => {
- dispatch({ type: 'CONFIG/NEW_CONFIG', payload: newConfig })
- })
-
- addActiveProfileListener(({ newProfile }) => {
- dispatch({ type: 'CONFIG/NEW_PROFILE', payload: newProfile })
- })
-}
diff --git a/src/content/redux/modules/dictionaries.ts b/src/content/redux/modules/dictionaries.ts
deleted file mode 100644
index d449782c5..000000000
--- a/src/content/redux/modules/dictionaries.ts
+++ /dev/null
@@ -1,484 +0,0 @@
-import { message } from '@/_helpers/browser-api'
-import { DictID, PreloadSource } from '@/app-config'
-import isEqual from 'lodash/isEqual'
-import { saveWord } from '@/_helpers/record-manager'
-import { getDefaultSelectionInfo, SelectionInfo, isSameSelection } from '@/_helpers/selection'
-import { MsgType, MsgFetchDictResult, MsgQSPanelSearchText, MsgFetchDictResultResponse, MsgAudioPlay } from '@/typings/message'
-import getDefaultProfile from '@/app-config/profiles'
-import { DeepReadonly } from '@/typings/helpers'
-import { StoreState, DispatcherThunk } from './index'
-import { isInNotebook, searchBoxUpdate } from './widget'
-import {
- countWords,
- checkSupportedLangs,
-} from '@/_helpers/lang-check'
-import { MachineTranslateResult } from '@/components/dictionaries/helpers'
-
-const isSaladictOptionsPage = !!window.__SALADICT_OPTIONS_PAGE__
-const isSaladictInternalPage = !!window.__SALADICT_INTERNAL_PAGE__
-const isSaladictPopupPage = !!window.__SALADICT_POPUP_PAGE__
-const isSaladictQuickSearchPage = !!window.__SALADICT_QUICK_SEARCH_PAGE__
-const isSaladictPDFPage = !!window.__SALADICT_PDF_PAGE__
-
-const isStandalonePage = isSaladictPopupPage || isSaladictQuickSearchPage
-const isNoSearchHistoryPage = isSaladictInternalPage && !isStandalonePage
-
-/*-----------------------------------------------*\
- Action Type
-\*-----------------------------------------------*/
-
-export const enum ActionType {
- NEW_CONFIG = 'dicts/NEW_CONFIG',
- SEARCH_START = 'dicts/SEARCH_START',
- SEARCH_END = 'dicts/SEARCH_END',
- RESTORE = 'dicts/RESTORE',
- ADD_HISTORY = 'dicts/ADD_HISTORY',
-}
-
-/*-----------------------------------------------*\
- Payload
-\*-----------------------------------------------*/
-
-interface DictionariesPayload {
- [ActionType.NEW_CONFIG]: undefined
- [ActionType.RESTORE]: undefined
- [ActionType.ADD_HISTORY]: SelectionInfo
- [ActionType.SEARCH_START]: {
- toOnhold: DictID[]
- toStart: DictID[]
- toActive?: DictID[]
- info: SelectionInfo
- }
- [ActionType.SEARCH_END]: {
- id: DictID
- info: SelectionInfo
- result: any
- }
-}
-
-/*-----------------------------------------------*\
- State
-\*-----------------------------------------------*/
-
-export const enum SearchStatus {
- OnHold,
- Searching,
- Finished,
-}
-
-type DictState = {
- readonly searchStatus: SearchStatus
- readonly searchResult: any
-}
-
-export type DictionariesState = {
- readonly dictionaries: {
- readonly selected: DeepReadonly<DictID[]>
- readonly active: DictID[]
- readonly dicts: {
- readonly [k in DictID]?: DictState
- }
- // 0 is the latest
- readonly searchHistory: SelectionInfo[]
- }
-}
-
-const defaultProfile = getDefaultProfile()
-
-export const initState: DictionariesState = {
- dictionaries: {
- selected: defaultProfile.dicts.selected,
- active: [],
- dicts: defaultProfile.dicts.selected
- .reduce((state, id) => {
- state[id] = {
- searchStatus: SearchStatus.OnHold,
- searchResult: null,
- }
- return state
- }, {}),
- searchHistory: [],
- }
-}
-
-/*-----------------------------------------------*\
- Reducer Object
-\*-----------------------------------------------*/
-
-type DictsReducer = {
- [k in ActionType]: (state: StoreState, payload: DictionariesPayload[k]) => StoreState
-}
-
-export const reducer: DictsReducer = {
- [ActionType.NEW_CONFIG] (state) {
- const { dictionaries } = state
- const { selected } = state.config.dicts
-
- if (isEqual(selected, dictionaries.selected)) {
- return state
- }
-
- return {
- ...state,
- dictionaries: {
- ...dictionaries,
- selected: selected.slice(),
- active: dictionaries.active.filter(id => selected.indexOf(id) !== -1),
- dicts: selected.reduce((newState, id) => {
- newState[id] = dictionaries.dicts[id] || {
- searchStatus: SearchStatus.OnHold,
- searchResult: null,
- }
- return newState
- }, {}),
- }
- }
- },
- [ActionType.RESTORE] (state) {
- const { dictionaries } = state
- return {
- ...state,
- dictionaries: {
- ...dictionaries,
- active: [],
- dicts: Object.keys(dictionaries.dicts).reduce((newDicts, id) => {
- newDicts[id] =
- dictionaries.dicts[id].searchStatus === SearchStatus.OnHold
- ? dictionaries.dicts[id]
- : {
- searchStatus: SearchStatus.OnHold,
- searchResult: null,
- }
- return newDicts
- }, {})
- }
- }
- },
- [ActionType.SEARCH_START] (state, { toStart, toOnhold, toActive, info }) {
- const { dictionaries, widget } = state
- const searchBoxIndex = widget.searchBox.index || 0
- const dicts = { ...dictionaries.dicts }
- toOnhold.forEach(id => {
- if (dicts[id]) {
- dicts[id] = {
- ...dicts[id],
- searchStatus: SearchStatus.OnHold,
- searchResult: null,
- }
- }
- })
- toStart.forEach(id => {
- if (dicts[id]) {
- dicts[id] = {
- ...dicts[id],
- searchStatus: SearchStatus.Searching,
- searchResult: null,
- }
- }
- })
-
- return {
- ...state,
- dictionaries: {
- ...dictionaries,
- active: toActive || dictionaries.active,
- searchHistory: info === dictionaries.searchHistory[searchBoxIndex]
- ? dictionaries.searchHistory
- // don't create history for same info
- : isSameSelection(info, dictionaries.searchHistory[0])
- ? [info, ...dictionaries.searchHistory.slice(1)]
- : [info, ...dictionaries.searchHistory],
- dicts,
- }
- }
- },
- [ActionType.SEARCH_END] (state, { id, info, result }) {
- const { dictionaries, widget } = state
-
- if (!isSameSelection(info, dictionaries.searchHistory[widget.searchBox.index || 0])) {
- // ignore the outdated selection
- return state
- }
-
- return {
- ...state,
- dictionaries: {
- ...dictionaries,
- dicts: {
- ...dictionaries.dicts,
- [id]: { ...dictionaries[id], searchStatus: SearchStatus.Finished, searchResult: result }
- }
- }
- }
- },
- [ActionType.ADD_HISTORY] (state, info) {
- const history = state.dictionaries.searchHistory
- return {
- ...state,
- dictionaries: {
- ...state.dictionaries,
- searchHistory: [info, ...history]
- }
- }
- }
-}
-
-/*-----------------------------------------------*\
- Action Creators
-\*-----------------------------------------------*/
-
-interface Action<T extends ActionType> {
- type: T,
- payload?: DictionariesPayload[T]
-}
-
-export function newConfig (): Action<ActionType.NEW_CONFIG> {
- return ({ type: ActionType.NEW_CONFIG })
-}
-
-export function restoreDicts (): Action<ActionType.RESTORE> {
- return ({ type: ActionType.RESTORE })
-}
-
-/** Search all selected dicts if id is not provided */
-export function searchStart (
- payload: DictionariesPayload[ActionType.SEARCH_START]
-): Action<ActionType.SEARCH_START> {
- return ({ type: ActionType.SEARCH_START, payload })
-}
-
-export function searchEnd (
- payload: DictionariesPayload[ActionType.SEARCH_END]
-): Action<ActionType.SEARCH_END> {
- return ({ type: ActionType.SEARCH_END, payload })
-}
-
-export function addSearchHistory (
- payload: DictionariesPayload[ActionType.ADD_HISTORY]
-): Action<ActionType.ADD_HISTORY> {
- return ({ type: ActionType.ADD_HISTORY, payload })
-}
-
-/*-----------------------------------------------*\
- Side Effects
-\*-----------------------------------------------*/
-
-export function startUpAction (): DispatcherThunk {
- return (dispatch, getState) => {
- if (isSaladictPopupPage) {
- const { baPreload, baAuto } = getState().config
- dispatch(summonedPanelInit(baPreload, baAuto, 'popup'))
- } else if (isSaladictQuickSearchPage) {
- /** From other tabs */
- message.addListener<MsgQSPanelSearchText>(MsgType.QSPanelSearchText, ({ info }) => {
- dispatch(searchText({ info }))
- // focus standalone panel
- message.send({ type: MsgType.OpenQSPanel })
- })
- }
- }
-}
-
-/**
- * Search all selected dicts if id is not provided.
- * Use last selection if info is not provided.
- */
-export function searchText (
- arg?: { id?: DictID, info?: SelectionInfo, payload?: { [index: string]: any } }
-): DispatcherThunk {
- return (dispatch, getState) => {
- const state = getState()
- const searchBoxIndex = state.widget.searchBox.index || 0
- const info = arg && arg.info
- ? arg.info
- : state.dictionaries.searchHistory[searchBoxIndex]
-
- // try to unfold a dict when the panel first popup
- if (!info || !info.text) { return }
-
- if (isSaladictOptionsPage) {
- window.__SALADICT_LAST_SEARCH__ = info.text
- }
-
- dispatch(isInNotebook(info))
-
- const requestID = arg && arg.id
-
- // search one dict, when user clicks the unfold arrow
- if (requestID) {
- dispatch(searchStart({ toStart: [requestID], toOnhold: [], info }))
- doSearch(requestID)
- return
- }
-
- const { selected: selectedDicts, all: allDicts } = state.config.dicts
- /** should display */
- const toActive: DictID[] = []
- /** should start searching */
- const toStart: DictID[] = []
- /** reset to folded state */
- const toOnhold: DictID[] = []
-
- selectedDicts.forEach(id => {
- const dict = allDicts[id]
- let isValidSelection = checkSupportedLangs(dict.selectionLang, info.text)
-
- if (isValidSelection) {
- const wordCount = countWords(info.text)
- const { min, max } = dict.selectionWC
- isValidSelection = wordCount >= min && wordCount <= max
- }
-
- if (isValidSelection) {
- toActive.push(id)
- }
-
- if (isValidSelection && checkSupportedLangs(dict.defaultUnfold, info.text)) {
- toStart.push(id)
- } else {
- toOnhold.push(id)
- }
- })
-
- if (!isNoSearchHistoryPage &&
- state.config.searhHistory &&
- (!browser.extension.inIncognitoContext || state.config.searhHistoryInco) &&
- !isSameSelection(state.dictionaries.searchHistory[0], info)
- ) {
- saveWord('history', info)
- }
-
- dispatch(searchStart({ toStart, toOnhold, toActive, info }))
- if (arg && arg.info) {
- // Reset index after search start. Index is useful.
- dispatch(searchBoxUpdate({ text: info.text, index: 0 }))
- }
-
- const pSearchResponses = toStart.map(doSearch)
-
- const { cn, en, machine } = state.config.autopron
-
- // dict with auto pronunciation but not searching
- if (cn.dict && !toStart.includes(cn.dict)) {
- pSearchResponses.push(requestDictResult(cn.dict))
- }
- if (en.dict && !toStart.includes(en.dict)) {
- pSearchResponses.push(requestDictResult(en.dict))
- }
- if (machine.dict && !toStart.includes(machine.dict)) {
- pSearchResponses.push(requestDictResult(machine.dict))
- }
-
- // handle auto pronunciation
- let hasPlayed = false
- for (const pSearchResponse of pSearchResponses) {
- pSearchResponse.then(({ id, result, audio }) => {
- if (hasPlayed) { return }
-
- if (audio) {
- if (id === cn.dict && audio.py) {
- message.send<MsgAudioPlay>({ type: MsgType.PlayAudio, src: audio.py })
- hasPlayed = true
- return
- }
-
- if (id === en.dict) {
- const src = en.accent === 'us'
- ? audio!.us || audio!.uk
- : audio!.uk || audio!.us
- if (src) {
- message.send<MsgAudioPlay>({ type: MsgType.PlayAudio, src })
- hasPlayed = true
- return
- }
- }
- }
-
- if (id === machine.dict) {
- const src = (result as MachineTranslateResult<DictID>)[machine.src].audio
- if (src) {
- message.send<MsgAudioPlay>({ type: MsgType.PlayAudio, src })
- hasPlayed = true
- return
- }
- }
- })
- }
-
- function requestDictResult (id: DictID): Promise<MsgFetchDictResultResponse<any>> {
- return message.send<MsgFetchDictResult>({
- type: MsgType.FetchDictResult,
- id,
- text: info.text,
- payload: arg && arg.payload
- ? { isPDF: isSaladictPDFPage, ...arg.payload }
- : { isPDF: isSaladictPDFPage },
- })
- }
-
- function doSearch (id: DictID): Promise<MsgFetchDictResultResponse<any>> {
- return requestDictResult(id)
- .then(response => {
- dispatch(searchEnd({ id, info, result: response.result }))
- return response
- })
- .catch(() => {
- dispatch(searchEnd({ id, info , result: null }))
- return { id, result: null }
- })
- }
- }
-}
-
-export function summonedPanelInit (
- preload: PreloadSource,
- autoSearch: boolean,
- // quick-search could be turned off so this argument is needed
- standalone: '' | 'popup' | 'quick-search',
-): DispatcherThunk {
- return async (dispatch, getState) => {
- if (!preload) { return }
-
- const state = getState()
-
- let info: SelectionInfo | null = null
-
- try {
- if (preload === 'selection') {
- if (standalone === 'popup') {
- const tab = (await browser.tabs.query({ active: true, currentWindow: true }))[0]
- if (tab && tab.id != null) {
- info = await message.send(tab.id, { type: MsgType.PreloadSelection })
- }
- } else if (standalone === 'quick-search') {
- const infoText = new URL(document.URL).searchParams.get('info')
- if (infoText) {
- try {
- info = JSON.parse(decodeURIComponent(infoText))
- } catch (err) {
- info = null
- }
- }
- } else {
- info = { ...state.selection.selectionInfo }
- }
- } else /* preload === clipboard */ {
- const text = await message.send({ type: MsgType.GetClipboard })
- info = getDefaultSelectionInfo({ text, title: 'From Clipboard' })
- }
- } catch (e) {
- if (process.env.DEV_BUILD) {
- console.warn(e)
- }
- }
-
- if (info) {
- if (autoSearch && info.text) {
- dispatch(searchText({ info }))
- } else {
- dispatch(restoreDicts())
- dispatch(searchBoxUpdate({ text: info.text, index: 0 }))
- }
- }
- }
-}
diff --git a/src/content/redux/modules/epics.ts b/src/content/redux/modules/epics.ts
deleted file mode 100644
index 4e32d3d94..000000000
--- a/src/content/redux/modules/epics.ts
+++ /dev/null
@@ -1,116 +0,0 @@
-import { StoreAction, StoreState } from '.'
-import { combineEpics } from 'redux-observable'
-import { mapTo, switchMap, map, share, take, filter, tap } from 'rxjs/operators'
-import { ofType } from '../utils/operators'
-import { merge, from, Observable } from 'rxjs'
-import { isInNotebook } from '@/_helpers/record-manager'
-import { message } from '@/_helpers/browser-api'
-import { isPDFPage } from '@/_helpers/saladict'
-import { DictID } from '@/app-config'
-import { MachineTranslateResult } from '@/components/dictionaries/helpers'
-
-export const epics = combineEpics<StoreAction, StoreAction, StoreState>(
- /** Start searching text. This will also send to Redux. */
- action$ =>
- action$.pipe(
- ofType('WIDGET/BOWL_ACTIVATED'),
- mapTo({ type: 'WIDGET/SEARCH_START' })
- ),
- (action$, state$) =>
- action$.pipe(
- ofType('WIDGET/SEARCH_START'),
- switchMap(({ payload }) => {
- const {
- widget,
- config: { config }
- } = state$.value
- const word = widget.searchHistory[widget.historyIndex]
-
- const toStart = new Set<DictID>()
- for (const d of state$.value.widget.renderedDicts) {
- if (d.searchStatus === 'SEARCHING') {
- toStart.add(d.id)
- }
- }
-
- const { cn, en, machine } = config.autopron
- if (cn.dict) toStart.add(cn.dict)
- if (en.dict) toStart.add(en.dict)
- if (machine.dict) toStart.add(machine.dict)
-
- const searchResults$$ = merge(
- ...[...toStart].map(id =>
- message
- .send({
- type: 'FETCH_DICT_RESULT',
- payload: {
- id,
- text: word.text,
- payload:
- payload && payload.payload
- ? { isPDF: isPDFPage(), ...payload.payload }
- : { isPDF: isPDFPage() }
- }
- })
- .catch(() => ({ id, result: null, audio: null }))
- )
- ).pipe(share())
-
- const playAudio$ = searchResults$$.pipe(
- filter(({ id, audio, result }) => {
- if (!audio) return false
- if (id === cn.dict && audio.py) return true
- if (id === en.dict && (audio.uk || audio.us)) return true
- return (
- id === machine.dict &&
- !!(result as MachineTranslateResult<DictID>)[machine.src].audio
- )
- }),
- take(1),
- tap(({ id, audio, result }) => {
- if (id === cn.dict) {
- return message.send({ type: 'PLAY_AUDIO', payload: audio!.py! })
- }
-
- if (id === en.dict) {
- const src =
- en.accent === 'us'
- ? audio!.us || audio!.uk
- : audio!.uk || audio!.us
- return message.send({ type: 'PLAY_AUDIO', payload: src! })
- }
-
- message.send({
- type: 'PLAY_AUDIO',
- payload: (result as MachineTranslateResult<DictID>)[machine.src]
- .audio!
- })
- }),
- // never passed to down stream
- filter(() => false)
- ) as Observable<never>
-
- return merge(
- from(isInNotebook(word).catch(() => false)).pipe(
- map(
- (isInNotebook): StoreAction => ({
- type: 'WIDGET/WORD_IN_NOTEBOOK',
- payload: isInNotebook
- })
- )
- ),
- searchResults$$.pipe(
- map(
- ({ id, result }): StoreAction => ({
- type: 'WIDGET/SEARCH_END',
- payload: { id, result }
- })
- )
- ),
- playAudio$
- )
- })
- )
-)
-
-export default epics
diff --git a/src/content/redux/modules/epics/index.ts b/src/content/redux/modules/epics/index.ts
new file mode 100644
index 000000000..07c6f3c0d
--- /dev/null
+++ b/src/content/redux/modules/epics/index.ts
@@ -0,0 +1,20 @@
+import { combineEpics } from 'redux-observable'
+import { mapTo } from 'rxjs/operators'
+import { StoreAction, StoreState } from '../'
+import { ofType } from '../../utils/operators'
+
+import searchStartEpic from './searchStart.epic'
+import newSelectionEpic from './newSelection.epic'
+
+export const epics = combineEpics<StoreAction, StoreAction, StoreState>(
+ /** Start searching text. This will also send to Redux. */
+ action$ =>
+ action$.pipe(
+ ofType('BOWL_ACTIVATED'),
+ mapTo({ type: 'SEARCH_START' })
+ ),
+ newSelectionEpic,
+ searchStartEpic
+)
+
+export default epics
diff --git a/src/content/redux/modules/epics/newSelection.epic.ts b/src/content/redux/modules/epics/newSelection.epic.ts
new file mode 100644
index 000000000..c669b19ec
--- /dev/null
+++ b/src/content/redux/modules/epics/newSelection.epic.ts
@@ -0,0 +1,110 @@
+import { switchMap } from 'rxjs/operators'
+import { empty, of } from 'rxjs'
+import { StoreAction, StoreState } from '../'
+import { Epic, ofType } from '../../utils/operators'
+import { message } from '@/_helpers/browser-api'
+import { isStandalonePage, isOptionsPage } from '@/_helpers/saladict'
+
+export const newSelectionEpic: Epic = (action$, state$) =>
+ action$.pipe(
+ ofType('NEW_SELECTION'),
+ switchMap(() => {
+ const {
+ config,
+ selection,
+ withQSPanel,
+ isShowDictPanel,
+ isPinned
+ } = state$.value
+
+ if (selection.self) {
+ // inside dict panel
+ return selectionInsideDictPanel(config, selection)
+ }
+
+ if (withQSPanel && config.tripleCtrlPageSel) {
+ // standalone panel takes control
+ return selectionToQSPanel(config, selection)
+ }
+
+ if (isStandalonePage() || isOptionsPage()) {
+ return empty()
+ }
+
+ const { pinMode } = config
+
+ if (
+ isShowDictPanel &&
+ selection.word.text &&
+ (!isPinned ||
+ pinMode.direct ||
+ (pinMode.double && selection.dbClick) ||
+ (pinMode.holding.shift && selection.shiftKey) ||
+ (pinMode.holding.ctrl && selection.ctrlKey) ||
+ (pinMode.holding.meta && selection.metaKey))
+ ) {
+ // continue searching
+ return of<StoreAction>({
+ type: 'SEARCH_START',
+ payload: { word: selection.word }
+ })
+ }
+
+ return empty()
+ })
+ )
+
+export default newSelectionEpic
+
+function selectionInsideDictPanel(
+ config: StoreState['config'],
+ selection: StoreState['selection']
+): ReturnType<Epic> {
+ // inside dict panel
+ const { direct, double, holding } = config.panelMode
+ if (
+ selection.word.text &&
+ (selection.instant ||
+ direct ||
+ (double && selection.dbClick) ||
+ (holding.shift && selection.shiftKey) ||
+ (holding.ctrl && selection.ctrlKey) ||
+ (holding.meta && selection.metaKey))
+ ) {
+ return of<StoreAction>({
+ type: 'SEARCH_START',
+ payload: {
+ word: {
+ ...selection.word,
+ title: 'Saladict Panel',
+ favicon:
+ 'https://raw.githubusercontent.com/crimx/ext-saladict/dev/public/static/icon-16.png'
+ }
+ }
+ })
+ }
+ return empty()
+}
+
+function selectionToQSPanel(
+ config: StoreState['config'],
+ selection: StoreState['selection']
+): ReturnType<Epic> {
+ // standalone panel takes control
+ const { direct, double, holding } = config.qsPanelMode
+ if (
+ selection.word.text &&
+ (selection.instant ||
+ direct ||
+ (double && selection.dbClick) ||
+ (holding.shift && selection.shiftKey) ||
+ (holding.ctrl && selection.ctrlKey) ||
+ (holding.meta && selection.metaKey))
+ ) {
+ message.send({
+ type: 'QS_PANEL_SEARCH_TEXT',
+ payload: selection.word
+ })
+ }
+ return empty()
+}
diff --git a/src/content/redux/modules/epics/searchStart.epic.ts b/src/content/redux/modules/epics/searchStart.epic.ts
new file mode 100644
index 000000000..c2d60aba6
--- /dev/null
+++ b/src/content/redux/modules/epics/searchStart.epic.ts
@@ -0,0 +1,109 @@
+import { switchMap, map, share, take, filter, tap } from 'rxjs/operators'
+import { merge, from } from 'rxjs'
+import { StoreAction } from '../'
+import { Epic, ofType } from '../../utils/operators'
+import { isInNotebook } from '@/_helpers/record-manager'
+import { message } from '@/_helpers/browser-api'
+import { isPDFPage } from '@/_helpers/saladict'
+import { DictID } from '@/app-config'
+import { MachineTranslateResult } from '@/components/dictionaries/helpers'
+
+export const searchStartEpic: Epic = (action$, state$) =>
+ action$.pipe(
+ ofType('SEARCH_START'),
+ switchMap(({ payload }) => {
+ const {
+ config,
+ searchHistory,
+ historyIndex,
+ renderedDicts
+ } = state$.value
+ const word = searchHistory[historyIndex]
+
+ const toStart = new Set<DictID>()
+ for (const d of renderedDicts) {
+ if (d.searchStatus === 'SEARCHING') {
+ toStart.add(d.id)
+ }
+ }
+
+ const { cn, en, machine } = config.autopron
+ if (cn.dict) toStart.add(cn.dict)
+ if (en.dict) toStart.add(en.dict)
+ if (machine.dict) toStart.add(machine.dict)
+
+ const searchResults$$ = merge(
+ ...[...toStart].map(id =>
+ message
+ .send<'FETCH_DICT_RESULT'>({
+ type: 'FETCH_DICT_RESULT',
+ payload: {
+ id,
+ text: word.text,
+ payload:
+ payload && payload.payload
+ ? { isPDF: isPDFPage(), ...payload.payload }
+ : { isPDF: isPDFPage() }
+ }
+ })
+ .catch(() => ({ id, result: null, audio: null }))
+ )
+ ).pipe(share())
+
+ const playAudio$ = searchResults$$.pipe(
+ filter(({ id, audio, result }) => {
+ if (!audio) return false
+ if (id === cn.dict && audio.py) return true
+ if (id === en.dict && (audio.uk || audio.us)) return true
+ return (
+ id === machine.dict &&
+ !!(result as MachineTranslateResult<DictID>)[machine.src].audio
+ )
+ }),
+ take(1),
+ tap(({ id, audio, result }) => {
+ if (id === cn.dict) {
+ return message.send({ type: 'PLAY_AUDIO', payload: audio!.py! })
+ }
+
+ if (id === en.dict) {
+ const src =
+ en.accent === 'us'
+ ? audio!.us || audio!.uk
+ : audio!.uk || audio!.us
+ return message.send({ type: 'PLAY_AUDIO', payload: src! })
+ }
+
+ message.send({
+ type: 'PLAY_AUDIO',
+ payload: (result as MachineTranslateResult<DictID>)[machine.src]
+ .audio!
+ })
+ }),
+ // never pass to down stream
+ filter((value): value is never => false)
+ )
+
+ return merge(
+ from(isInNotebook(word).catch(() => false)).pipe(
+ map(
+ (isInNotebook): StoreAction => ({
+ type: 'WORD_IN_NOTEBOOK',
+ payload: isInNotebook
+ })
+ )
+ ),
+ searchResults$$.pipe(
+ map(
+ ({ id, result }): StoreAction => ({
+ type: 'SEARCH_END',
+ payload: { id, result }
+ })
+ )
+ ),
+ playAudio$
+ )
+ })
+ )
+
+export default searchStartEpic
diff --git a/src/content/redux/modules/index.ts b/src/content/redux/modules/index.ts
index 6ed19079d..0d6176a3b 100644
--- a/src/content/redux/modules/index.ts
+++ b/src/content/redux/modules/index.ts
@@ -1,44 +1,25 @@
-import { combineReducers, Dispatch } from 'redux'
-import { Action, ActionType } from '../utils/types'
+import { Dispatch } from 'redux'
+import { initState } from './state'
+import { ActionCatalog } from './action-catalog'
+import { Action, ActionType, ActionHandler } from '../utils/types'
+import { reducer } from './reducer'
-import {
- ActionCatalog as ConfigActionCatalog,
- State as ConfigState,
- reducer as configReducer
-} from './config'
+export type StoreState = typeof initState
-import {
- ActionCatalog as SelectionActionCatalog,
- State as SelectionState,
- reducer as SelectionReducer
-} from './selection'
+export type StoreActionCatalog = ActionCatalog
-import {
- ActionCatalog as WidgetActionCatalog,
- State as WidgetState,
- reducer as WidgetReducer
-} from './widget'
+export type StoreAction = Action<ActionCatalog>
-export type StoreActionCatalog = ConfigActionCatalog &
- SelectionActionCatalog &
- WidgetActionCatalog
+export type StoreActionType = ActionType<ActionCatalog>
-export type StoreState = {
- config: ConfigState
- selection: SelectionState
- widget: WidgetState
-}
-
-export type StoreAction = Action<StoreActionCatalog>
-
-export type StoreActionType = ActionType<StoreActionCatalog>
+export type StoreActionHandler<T extends StoreActionType> = ActionHandler<
+ ActionCatalog,
+ StoreState,
+ T
+>
export type StoreDispatch = Dispatch<StoreAction>
-export const rootReducer = combineReducers<StoreState, StoreAction>({
- config: configReducer,
- selection: SelectionReducer,
- widget: WidgetReducer
-})
+export const rootReducer = reducer
export default rootReducer
diff --git a/src/content/redux/modules/init.ts b/src/content/redux/modules/init.ts
new file mode 100644
index 000000000..fe719f04e
--- /dev/null
+++ b/src/content/redux/modules/init.ts
@@ -0,0 +1,31 @@
+import { Init } from '../utils/types'
+import { addConfigListener } from '@/_helpers/config-manager'
+import { addActiveProfileListener } from '@/_helpers/profile-manager'
+import { isPopupPage, isQuickSearchPage } from '@/_helpers/saladict'
+import { StoreActionCatalog, StoreState } from '.'
+import { message } from '@/_helpers/browser-api'
+
+export const init: Init<StoreActionCatalog, StoreState> = (
+ dispatch,
+ getState
+) => {
+ addConfigListener(({ newConfig }) => {
+ dispatch({ type: 'NEW_CONFIG', payload: newConfig })
+ })
+
+ addActiveProfileListener(({ newProfile }) => {
+ dispatch({ type: 'NEW_PROFILE', payload: newProfile })
+ })
+
+ if (isPopupPage()) {
+ const { baPreload, baAuto } = getState().config
+ dispatch(summonedPanelInit(baPreload, baAuto, 'popup'))
+ } else if (isQuickSearchPage()) {
+ /** From other tabs */
+ message.addListener('QS_PANEL_SEARCH_TEXT', ({ payload }) => {
+ dispatch({ type: 'SEARCH_START', payload: { word: payload } })
+ // focus standalone panel
+ message.send({ type: 'OPEN_QS_PANEL' })
+ })
+ }
+}
diff --git a/src/content/redux/modules/reducer/index.ts b/src/content/redux/modules/reducer/index.ts
new file mode 100644
index 000000000..1de6cbcf8
--- /dev/null
+++ b/src/content/redux/modules/reducer/index.ts
@@ -0,0 +1,60 @@
+import { createReducer } from '../../utils/createReducer'
+import { initState } from '../state'
+import { ActionCatalog } from '../action-catalog'
+import { searchStart } from './search-start.handler'
+import { newSelection } from './new-selection.handler'
+
+export const reducer = createReducer<typeof initState, ActionCatalog>(
+ initState,
+ {
+ NEW_CONFIG: (state, { payload }) => {
+ const url = window.location.href
+ return {
+ ...state,
+ config: payload,
+ isTempDisabled:
+ payload.blacklist.some(([r]) => new RegExp(r).test(url)) &&
+ payload.whitelist.every(([r]) => !new RegExp(r).test(url))
+ }
+ },
+ NEW_PROFILE: (state, { payload }) => ({
+ ...state,
+ activeProfile: payload,
+ renderedDicts: state.renderedDicts.filter(({ id }) =>
+ payload.dicts.selected.includes(id)
+ )
+ }),
+ NEW_SELECTION: newSelection,
+ BOWL_ACTIVATED: state => ({
+ ...state,
+ isShowBowl: false,
+ isShowDictPanel: true
+ }),
+ SEARCH_END: (state, { payload }) => {
+ if (state.renderedDicts.every(({ id }) => id !== payload.id)) {
+ // this dict is for auto-pronunciation only
+ return state
+ }
+
+ return {
+ ...state,
+ renderedDicts: state.renderedDicts.map(d =>
+ d.id === payload.id
+ ? {
+ id: d.id,
+ searchStatus: 'FINISH',
+ searchResult: payload.result
+ }
+ : d
+ )
+ }
+ },
+ SEARCH_START: searchStart,
+ WORD_IN_NOTEBOOK: (state, { payload }) => ({
+ ...state,
+ isFav: payload
+ })
+ }
+)
+
+export default reducer
diff --git a/src/content/redux/modules/reducer/new-selection.handler.ts b/src/content/redux/modules/reducer/new-selection.handler.ts
new file mode 100644
index 000000000..35aef497e
--- /dev/null
+++ b/src/content/redux/modules/reducer/new-selection.handler.ts
@@ -0,0 +1,63 @@
+import { StoreActionHandler } from '..'
+import { isStandalonePage, isOptionsPage } from '@/_helpers/saladict'
+
+export const newSelection: StoreActionHandler<'NEW_SELECTION'> = (
+ state,
+ { payload }
+) => {
+ const { selection, config } = state
+
+ const newState = {
+ ...state,
+ selection: payload,
+ dictPanelCord: {
+ mouseX: selection.mouseX,
+ mouseY: selection.mouseY
+ }
+ }
+
+ if (
+ selection.self ||
+ (state.withQSPanel && config.tripleCtrlPageSel) ||
+ isStandalonePage() ||
+ isOptionsPage()
+ ) {
+ return newState
+ }
+
+ const isActive = config.active && !state.isTempDisabled
+
+ const { direct, holding, double, icon } = config.mode
+
+ newState.isShowDictPanel = Boolean(
+ state.isPinned ||
+ (isActive &&
+ selection.word.text &&
+ (state.isShowDictPanel ||
+ direct ||
+ (double && selection.dbClick) ||
+ (holding.shift && selection.shiftKey) ||
+ (holding.ctrl && selection.ctrlKey) ||
+ (holding.meta && selection.metaKey) ||
+ selection.instant)) ||
+ isStandalonePage()
+ )
+
+ newState.isShowBowl = Boolean(
+ isActive &&
+ selection.word.text &&
+ icon &&
+ !newState.isShowDictPanel &&
+ !direct &&
+ !(double && selection.dbClick) &&
+ !(holding.shift && selection.shiftKey) &&
+ !(holding.ctrl && selection.ctrlKey) &&
+ !(holding.meta && selection.metaKey) &&
+ !selection.instant &&
+ !isStandalonePage()
+ )
+
+ return newState
+}
+
+export default newSelection
diff --git a/src/content/redux/modules/reducer/search-start.handler.ts b/src/content/redux/modules/reducer/search-start.handler.ts
new file mode 100644
index 000000000..ced815efd
--- /dev/null
+++ b/src/content/redux/modules/reducer/search-start.handler.ts
@@ -0,0 +1,70 @@
+import { StoreActionHandler } from '..'
+import { checkSupportedLangs, countWords } from '@/_helpers/lang-check'
+
+export const searchStart: StoreActionHandler<'SEARCH_START'> = (
+ state,
+ { payload }
+) => {
+ const { activeProfile, searchHistory } = state
+ if ((!payload || !payload.word) && searchHistory.length <= 0) {
+ if (process.env.NODE_ENV !== 'production') {
+ console.warn(`SEARCH_START: Empty word on first search`, payload)
+ }
+ return state
+ }
+
+ // is the new word equal to the last word in history
+ const shouldAddHistory =
+ payload &&
+ payload.word &&
+ (payload.word.text !== searchHistory[0].text ||
+ payload.word.context !== searchHistory[0].context)
+
+ const word = (payload && payload.word) || searchHistory[0]
+
+ return {
+ ...state,
+ searchHistory: shouldAddHistory
+ ? [...searchHistory, payload!.word!]
+ : searchHistory,
+ historyIndex: shouldAddHistory ? searchHistory.length : state.historyIndex,
+ renderedDicts:
+ payload && payload.id
+ ? // expand an folded dict item
+ state.renderedDicts.map(d =>
+ d.id === payload.id
+ ? {
+ id: d.id,
+ searchStatus: 'SEARCHING',
+ searchResult: null
+ }
+ : d
+ )
+ : activeProfile.dicts.selected
+ .filter(id => {
+ // dicts that should be rendered
+ const dict = activeProfile.dicts.all[id]
+ if (checkSupportedLangs(dict.selectionLang, word.text)) {
+ const wordCount = countWords(word.text)
+ const { min, max } = dict.selectionWC
+ return wordCount >= min && wordCount <= max
+ }
+ return false
+ })
+ .map(id => {
+ // fold or unfold
+ return {
+ id,
+ searchStatus: checkSupportedLangs(
+ activeProfile.dicts.all[id].defaultUnfold,
+ word.text
+ )
+ ? 'SEARCHING'
+ : 'IDLE',
+ searchResult: null
+ }
+ })
+ }
+}
+
+export default searchStart
diff --git a/src/content/redux/modules/selection.ts b/src/content/redux/modules/selection.ts
deleted file mode 100644
index 726f4670b..000000000
--- a/src/content/redux/modules/selection.ts
+++ /dev/null
@@ -1,38 +0,0 @@
-import { message } from '@/_helpers/browser-api'
-import { Message } from '@/typings/message'
-import { newWord } from '@/_helpers/record-manager'
-import { createReducer } from '../utils/createReducer'
-import { Init } from '../utils/types'
-
-export type ActionCatalog = {
- 'SELECTION/NEW_SELECTION': {
- payload: Message<'SELECTION'>['payload']
- }
-}
-
-export type State = typeof initState
-
-export const initState: Message<'SELECTION'>['payload'] = {
- word: newWord(),
- mouseX: 0,
- mouseY: 0,
- self: false,
- dbClick: false,
- shiftKey: false,
- ctrlKey: false,
- metaKey: false,
- instant: false,
- force: false
-}
-
-export const reducer = createReducer<ActionCatalog, State>(initState, {
- 'SELECTION/NEW_SELECTION': (state, action) => action.payload
-})
-
-export default reducer
-
-export const init: Init<ActionCatalog> = dispatch => {
- message.self.addListener('SELECTION', ({ payload }) => {
- dispatch({ type: 'SELECTION/NEW_SELECTION', payload })
- })
-}
diff --git a/src/content/redux/modules/state.ts b/src/content/redux/modules/state.ts
new file mode 100644
index 000000000..9e2b68568
--- /dev/null
+++ b/src/content/redux/modules/state.ts
@@ -0,0 +1,46 @@
+import { newWord, Word } from '@/_helpers/record-manager'
+import { getDefaultConfig, DictID } from '@/app-config'
+import { getDefaultProfile } from '@/app-config/profiles'
+
+export const initState = {
+ activeProfile: getDefaultProfile(),
+ config: getDefaultConfig(),
+ selection: {
+ word: newWord(),
+ mouseX: 0,
+ mouseY: 0,
+ self: false,
+ dbClick: false,
+ shiftKey: false,
+ ctrlKey: false,
+ metaKey: false,
+ instant: false,
+ force: false
+ },
+ isShowBowl: false,
+ isShowDictPanel: false,
+ /** Temporary disable Saladict */
+ isTempDisabled: false,
+ isPinned: false,
+ /** is a standalone quick search panel running */
+ withQSPanel: false,
+ /** Is current word in Notebook */
+ isFav: false,
+ /** -1 is for panel show triggered by anything other than selection */
+ dictPanelCord: {
+ mouseX: -1,
+ mouseY: -1
+ },
+ /** Dicts that will be rendered to dict panel */
+ renderedDicts: [] as {
+ readonly id: DictID
+ readonly searchStatus: 'IDLE' | 'SEARCHING' | 'FINISH'
+ readonly searchResult: any
+ }[],
+ /** 0 is the oldest */
+ searchHistory: [] as Word[],
+ /** User can view back search history */
+ historyIndex: 0
+}
+
+export default initState
diff --git a/src/content/redux/modules/widget.ts b/src/content/redux/modules/widget.ts
deleted file mode 100644
index 8417b00de..000000000
--- a/src/content/redux/modules/widget.ts
+++ /dev/null
@@ -1,158 +0,0 @@
-import { createReducer } from '../utils/createReducer'
-import { Init } from '../utils/types'
-import { DictID } from '@/app-config'
-import { Word } from '@/_helpers/record-manager'
-import getDefaultProfile from '@/app-config/profiles'
-import { checkSupportedLangs, countWords } from '@/_helpers/lang-check'
-
-export type ActionCatalog = {
- /** Click or hover on salad bowl */
- 'WIDGET/BOWL_ACTIVATED': {}
- 'WIDGET/SEARCH_END': {
- payload: {
- id: DictID
- result: any
- }
- }
- 'WIDGET/SEARCH_START': {
- payload?: {
- /** Search with specific dict */
- id?: DictID
- /** Search specific word */
- word?: Word
- /** Additional payload passed to search engine */
- payload?: any
- }
- }
- /** Is current word in Notebook */
- 'WIDGET/WORD_IN_NOTEBOOK': {
- payload: boolean
- }
-}
-
-export type State = typeof initState
-
-const initState = {
- isShowBowl: false,
- isShowDictPanel: false,
- /** is a standalone quick search panel running */
- withQSPanel: false,
- /** Is current word in Notebook */
- isFav: false,
- dictsConfig: getDefaultProfile().dicts,
- /** Dicts that will be rendered to dict panel */
- renderedDicts: [] as {
- readonly id: DictID
- readonly searchStatus: 'IDLE' | 'SEARCHING' | 'FINISH'
- readonly searchResult: any
- }[],
- /** 0 is the oldest */
- searchHistory: [] as Word[],
- /** User can view back search history */
- historyIndex: 0
-}
-
-export const reducer = createReducer<ActionCatalog, State>(initState, {
- 'CONFIG/NEW_PROFILE': (state, { payload }) => ({
- ...state,
- dictsConfig: payload.dicts,
- renderedDicts: state.renderedDicts.filter(({ id }) =>
- payload.dicts.selected.includes(id)
- )
- }),
- 'WIDGET/BOWL_ACTIVATED': state => ({
- ...state,
- isShowBowl: false,
- isShowDictPanel: true
- }),
- 'WIDGET/SEARCH_END': (state, { payload }) => {
- if (state.renderedDicts.every(({ id }) => id !== payload.id)) {
- // this dict is for auto-pronunciation only
- return state
- }
-
- return {
- ...state,
- renderedDicts: state.renderedDicts.map(d =>
- d.id === payload.id
- ? {
- id: d.id,
- searchStatus: 'FINISH',
- searchResult: payload.result
- }
- : d
- )
- }
- },
- 'WIDGET/SEARCH_START': (state, { payload }) => {
- if ((!payload || !payload.word) && state.searchHistory.length <= 0) {
- if (process.env.NODE_ENV !== 'production') {
- console.warn(`WIDGET/SEARCH_START: Empty word on first search`, payload)
- }
- return state
- }
-
- // is the new word equal to the last word in history
- const shouldAddHistory =
- payload &&
- payload.word &&
- (payload.word.text !== state.searchHistory[0].text ||
- payload.word.context !== state.searchHistory[0].context)
-
- const word = (payload && payload.word) || state.searchHistory[0]
-
- return {
- ...state,
- renderedDicts:
- payload && payload.id
- ? // expand an folded dict item
- state.renderedDicts.map(d =>
- d.id === payload.id
- ? {
- id: d.id,
- searchStatus: 'SEARCHING',
- searchResult: null
- }
- : d
- )
- : state.dictsConfig.selected
- .filter(id => {
- // dicts that should be rendered
- const dict = state.dictsConfig.all[id]
- if (checkSupportedLangs(dict.selectionLang, word.text)) {
- const wordCount = countWords(word.text)
- const { min, max } = dict.selectionWC
- return wordCount >= min && wordCount <= max
- }
- return false
- })
- .map(id => {
- // fold or unfold
- return {
- id,
- searchStatus: checkSupportedLangs(
- state.dictsConfig.all[id].defaultUnfold,
- word.text
- )
- ? 'SEARCHING'
- : 'IDLE',
- searchResult: null
- }
- }),
- searchHistory: shouldAddHistory
- ? [...state.searchHistory, payload!.word!]
- : state.searchHistory,
- historyIndex: shouldAddHistory
- ? state.searchHistory.length
- : state.historyIndex
- }
- },
- 'WIDGET/WORD_IN_NOTEBOOK': (state, { payload }) => ({
- ...state,
- isFav: payload
- })
-})
-
-export default reducer
-
-export const init: Init<ActionCatalog> = dispatch => {}
diff --git a/src/content/redux/utils/createReducer.ts b/src/content/redux/utils/createReducer.ts
index 29f30bdf5..2b1272200 100644
--- a/src/content/redux/utils/createReducer.ts
+++ b/src/content/redux/utils/createReducer.ts
@@ -1,7 +1,7 @@
import { StoreActionCatalog, StoreAction } from '../modules'
import { ActionHandlers } from '../utils/types'
-export const createReducer = <C extends {}, S extends {}>(
+export const createReducer = <S extends {}, C extends {}>(
initialState: S,
handlers: ActionHandlers<C, S, StoreActionCatalog>
) =>
diff --git a/src/content/redux/utils/operators.ts b/src/content/redux/utils/operators.ts
index 9cd2a5cd5..9b80d2cad 100644
--- a/src/content/redux/utils/operators.ts
+++ b/src/content/redux/utils/operators.ts
@@ -1,7 +1,15 @@
import { Observable } from 'rxjs'
import { filter } from 'rxjs/operators'
-import { StoreActionCatalog, StoreActionType, StoreAction } from '../modules'
+import { Epic as EpicTemplate } from 'redux-observable'
import { Action } from './types'
+import {
+ StoreActionCatalog,
+ StoreActionType,
+ StoreAction,
+ StoreState
+} from '../modules'
+
+export type Epic = EpicTemplate<StoreAction, StoreAction, StoreState>
/** Tailored epic ofType */
export function ofType<T extends StoreActionType>(
diff --git a/src/content/redux/utils/types.ts b/src/content/redux/utils/types.ts
index 240926b6e..07432b17c 100644
--- a/src/content/redux/utils/types.ts
+++ b/src/content/redux/utils/types.ts
@@ -53,6 +53,7 @@ export type ActionHandlers<
}
/** Perform init operations e.g. setup listeners */
-export type Init<C extends ActionCatalog> = (
- dispatch: Dispatch<Action<C>>
+export type Init<C extends ActionCatalog, S extends {}> = (
+ dispatch: Dispatch<Action<C>>,
+ getState: () => S
) => void
|
refactor
|
re-structure redux
|
f5a544073e6065a41fc44143fc5d7b025748623d
|
2020-04-29 21:59:49
|
crimx
|
refactor(helpers): record message call context on debug
| false
|
diff --git a/src/_helpers/browser-api.ts b/src/_helpers/browser-api.ts
index 24217eb4b..72e22e597 100644
--- a/src/_helpers/browser-api.ts
+++ b/src/_helpers/browser-api.ts
@@ -317,14 +317,16 @@ function messageSend<T extends MsgType, R = MessageResponse<T>>(
function messageSend<T extends MsgType>(
...args: [Message<T>] | [number, Message<T>]
): Promise<any> {
+ let callContext: Error
+ if (process.env.DEBUG) {
+ callContext = new Error('Message Call Context')
+ }
return (args.length === 1
? browser.runtime.sendMessage(args[0])
: browser.tabs.sendMessage(args[0], args[1])
).catch(err => {
if (process.env.DEBUG) {
- console.warn(err, ...args)
- } else if (process.env.NODE_ENV !== 'production') {
- return Promise.reject(err) as any
+ console.warn(err.message, ...args, callContext)
}
})
}
@@ -332,6 +334,11 @@ function messageSend<T extends MsgType>(
async function messageSendSelf<T extends MsgType, R = undefined>(
message: Message<T>
): Promise<R extends undefined ? MessageResponse<T> : R> {
+ let callContext: Error
+ if (process.env.DEBUG) {
+ callContext = new Error('Message Call Context')
+ }
+
if (window.pageId === undefined) {
await initClient()
}
@@ -344,9 +351,7 @@ async function messageSendSelf<T extends MsgType, R = undefined>(
)
.catch(err => {
if (process.env.DEBUG) {
- console.warn(err, message)
- } else if (process.env.NODE_ENV !== 'production') {
- return Promise.reject(err) as any
+ console.warn(err.message, message, callContext)
}
})
}
|
refactor
|
record message call context on debug
|
94ba8ddb1fabc7c20f85540c1816e21c7c5c78ff
|
2019-08-25 11:53:13
|
crimx
|
refactor(selection): finish instant capture
| false
|
diff --git a/src/content/__fake__/env-instant-capture.ts b/src/content/__fake__/env-instant-capture.ts
new file mode 100644
index 000000000..2331e8692
--- /dev/null
+++ b/src/content/__fake__/env-instant-capture.ts
@@ -0,0 +1,13 @@
+import { createIntantCaptureStream } from '@/selection/instant-capture'
+import getDefaultConfig, { AppConfigMutable, AppConfig } from '@/app-config'
+import { Subject } from 'rxjs'
+
+const config = getDefaultConfig() as AppConfigMutable
+config.mode.instant.enable = true
+config.mode.instant.key = 'ctrl'
+
+const input$$ = new Subject<Readonly<[AppConfig, boolean, boolean]>>()
+
+createIntantCaptureStream(input$$).subscribe(console.log)
+
+input$$.next([config, false, false] as const)
diff --git a/src/selection/instant-capture.ts b/src/selection/instant-capture.ts
index 1669a7f0f..4ed97ac45 100644
--- a/src/selection/instant-capture.ts
+++ b/src/selection/instant-capture.ts
@@ -1,46 +1,32 @@
import { getText, getSentence } from 'get-selection-more'
import { AppConfig } from '@/app-config'
import { isStandalonePage, isInDictPanel } from '@/_helpers/saladict'
-import { message } from '@/_helpers/browser-api'
import { checkSupportedLangs } from '@/_helpers/lang-check'
import { Word, newWord } from '@/_helpers/record-manager'
-import { combineLatest, from, fromEvent, merge, of, Observable } from 'rxjs'
+import { fromEvent, merge, of, Observable, timer } from 'rxjs'
import {
map,
mapTo,
- pluck,
filter,
- startWith,
switchMap,
- debounceTime,
distinctUntilChanged,
- share
+ debounce
} from 'rxjs/operators'
import { isBlacklisted } from './helper'
-export function getIntantCapture$(
- config$: Observable<AppConfig>,
- validMouseup$: Observable<any>
+/**
+ * Create an instant capture Observable
+ * @param input$ Observable of app config,
+ * is panel pinned, and is the Quick Search Panel showing.
+ */
+export function createIntantCaptureStream(
+ input$: Observable<Readonly<[AppConfig, boolean, boolean]>>
) {
- return combineLatest(
- config$,
- message.self.createStream('PIN_STATE').pipe(
- pluck('payload'),
- startWith(false)
- ),
- merge(
- // When Quick Search Panel show and hide
- from(message.send<'QUERY_QS_PANEL'>({ type: 'QUERY_QS_PANEL' })),
- message.createStream('QS_PANEL_CHANGED').pipe(
- pluck('payload'),
- startWith(false)
- )
- )
- ).pipe(
+ return input$.pipe(
switchMap(([config, isPinned, withQSPanel]) => {
- if (!isBlacklisted(config)) return of(null)
+ if (isBlacklisted(config)) return of(null)
const { instant: panelInstant } = config.panelMode
const { instant: otherInstant } = config[
@@ -51,35 +37,39 @@ export function getIntantCapture$(
return of(null)
}
- const cancelInstant$$ = share<null>()(
- merge(
- mapTo(null)(validMouseup$),
- mapTo(null)(fromEvent(window, 'mouseout', { capture: true }))
- )
- )
-
- return fromEvent<MouseEvent>(window, 'mousemove', { capture: true }).pipe(
- // extra inner Observable to get debounceTime
- switchMap(event => {
- const self = isInDictPanel(event.target)
- const instant =
- self || isStandalonePage() ? panelInstant : otherInstant
- if (instant.enable) {
- if (
- (instant.key === 'alt' && event.altKey) ||
- (instant.key === 'shift' && event.shiftKey) ||
- (instant.key === 'ctrl' && (event.ctrlKey || event.metaKey)) ||
- (instant.key === 'direct' &&
- !(event.ctrlKey || event.metaKey || event.altKey))
- ) {
- return cancelInstant$$.pipe(
- startWith([event, config, self] as const),
- debounceTime(instant.delay)
- )
+ // Reduce GC
+ // Only the latest result is used so it's safe to reuse the array
+ const reuseTuple = ([] as unknown) as [MouseEvent, AppConfig, boolean]
+
+ return merge(
+ mapTo(null)(fromEvent(window, 'mouseup', { capture: true })),
+ mapTo(null)(fromEvent(window, 'mouseout', { capture: true })),
+ fromEvent<MouseEvent>(window, 'mousemove', { capture: true }).pipe(
+ map(event => {
+ const self = isInDictPanel(event.target)
+ const instant =
+ self || isStandalonePage() ? panelInstant : otherInstant
+ if (instant.enable) {
+ if (
+ (instant.key === 'alt' && event.altKey) ||
+ (instant.key === 'shift' && event.shiftKey) ||
+ (instant.key === 'ctrl' && (event.ctrlKey || event.metaKey)) ||
+ (instant.key === 'direct' &&
+ !(event.ctrlKey || event.metaKey || event.altKey))
+ ) {
+ reuseTuple[0] = event
+ reuseTuple[1] = config
+ reuseTuple[2] = self
+ return reuseTuple
+ }
}
- }
- return of(null)
- })
+ return null
+ })
+ )
+ ).pipe(
+ debounce(arg =>
+ arg ? timer(arg[2] ? panelInstant.delay : otherInstant.delay) : of()
+ )
)
}),
map(
@@ -163,8 +153,8 @@ function getCursorWord(event: MouseEvent): Word | null {
const text = getText()
const context = getSentence()
+ sel.removeAllRanges()
if (originRange) {
- sel.removeAllRanges()
sel.addRange(originRange)
}
range.detach()
|
refactor
|
finish instant capture
|
272880fe3fad780116bce8f9cf65f9133af9c1e1
|
2018-04-27 14:57:09
|
CRIMX
|
refactor(content): reduce mouse on bowl delay
| false
|
diff --git a/src/content/components/SaladBowl/index.tsx b/src/content/components/SaladBowl/index.tsx
index 5a5174105..cbe23815d 100644
--- a/src/content/components/SaladBowl/index.tsx
+++ b/src/content/components/SaladBowl/index.tsx
@@ -26,7 +26,7 @@ export default class SaladBowl extends React.PureComponent<SaladBowlProps> {
this.mouseOnBowlTimeout = setTimeout(() => {
this.props.mouseOnBowl(true)
this.props.searchText()
- }, 800)
+ }, 500)
}
handleMouseLeave = () => {
|
refactor
|
reduce mouse on bowl delay
|
853e7b15531b9a6cfb1f2c728f55a3f083dc8b59
|
2018-10-11 15:59:46
|
CRIMX
|
refactor(options): add quick search panel options
| false
|
diff --git a/src/_locales/options/messages.json b/src/_locales/options/messages.json
index 75daf4e6a..41806d652 100644
--- a/src/_locales/options/messages.json
+++ b/src/_locales/options/messages.json
@@ -452,7 +452,7 @@
"no_type_field": {
"en": "No selection in editable regions",
"zh_CN": "不在输入框划词",
- "zh_TW": "不在輸入框鼠標滑字"
+ "zh_TW": "不在輸入框滑鼠滑字"
},
"none": {
"en": "None",
@@ -507,7 +507,7 @@
"preference_description": {
"en": "Switch off animation transitions to reduce runtime cost. If selection making in editable regions is banned, the extension will identify Input Boxes, TextAreas and other common text editors like CodeMirror, ACE and Monaco.",
"zh_CN": "关闭过渡动画可减少资源消耗。关闭输入框划词后，本扩展会自动识别输入框以及常见编辑器，如 CodeMirror、ACE 和 Monaco。",
- "zh_TW": "關閉轉換動畫可減少資源消耗。關閉輸入框鼠標滑字后，本程式會自動識別輸入框以及常見編輯器，如 CodeMirror、ACE 和 Monaco。"
+ "zh_TW": "關閉轉換動畫可減少資源消耗。關閉輸入框滑鼠滑字后，本程式會自動識別輸入框以及常見編輯器，如 CodeMirror、ACE 和 Monaco。"
},
"preference_title": {
"en": "Preference",
@@ -594,6 +594,11 @@
"zh_CN": "连续按三次<kbd>Ctrl</kbd>或者<kbd>Command ⌘</kbd>键将弹出词典界面。选择预先加载内容会显示在输入框里。启动自动查词将在面板出现之后自动开始查词。",
"zh_TW": "連續按三次<kbd>Ctrl</kbd>或者<kbd>Command ⌘</kbd>鍵，將會彈出字典視窗介面。選擇預先下載的內容，會顯示在輸入框裡。啟動自動查字功能，字典視窗介面會出現，此時，會自動開始查尋單字。"
},
+ "triple_ctrl_height": {
+ "en": "Window Height",
+ "zh_CN": "窗口高度",
+ "zh_TW": "視窗高度"
+ },
"triple_ctrl_loc_0": {
"en": "Center",
"zh_CN": "居中",
@@ -644,6 +649,16 @@
"zh_CN": "出现位置",
"zh_TW": "出現位置"
},
+ "triple_ctrl_page_selection": {
+ "en": "Response to page selection",
+ "zh_CN": "响应主页面划词",
+ "zh_TW": "對主介面滑鼠滑字作出反應"
+ },
+ "triple_ctrl_standalone": {
+ "en": "Standalone",
+ "zh_CN": "独立窗口",
+ "zh_TW": "獨立視窗"
+ },
"triple_ctrl_title": {
"en": "Quick Search",
"zh_CN": "快捷查词",
diff --git a/src/options/OptTripleCtrl.vue b/src/options/OptTripleCtrl.vue
index 4f0063794..cc2337a0f 100644
--- a/src/options/OptTripleCtrl.vue
+++ b/src/options/OptTripleCtrl.vue
@@ -5,27 +5,84 @@
</div>
<div class="opt-item__body">
<div class="select-box-container">
- <label class="select-box">
- <span class="select-label">{{ $t('opt:preload') }}</span>
- <select class="form-control" v-model="tripleCtrlPreload">
- <option value="">{{ $t('opt:none') }}</option>
- <option value="clipboard">{{ $t('opt:preload_clipboard') }}</option>
- <option value="selection">{{ $t('opt:preload_selection') }}</option>
- </select>
- </label>
- <label class="checkbox-inline">
- <input type="checkbox" v-model="tripleCtrlAuto"> {{ $t('opt:preload_auto') }}
- </label>
- <label class="select-box">
- <span class="select-label">{{ $t('opt:triple_ctrl_loc_title') }}</span>
- <select class="form-control" v-model.number="tripleCtrlLocation">
- <option v-for="n in 9" :value="n - 1" :key="n">{{ $t(`opt:triple_ctrl_loc_${n-1}`) }}</option>
- </select>
- </label>
<label class="checkbox-inline">
<input type="checkbox" v-model="tripleCtrl"> {{ $t('opt:triple_ctrl') }}
</label>
+ <transition name="fade">
+ <span v-if="tripleCtrl">
+ <label class="select-box">
+ <span class="select-label">{{ $t('opt:triple_ctrl_loc_title') }}</span>
+ <select class="form-control" v-model.number="tripleCtrlLocation">
+ <option v-for="n in 9" :value="n - 1" :key="n">{{ $t(`opt:triple_ctrl_loc_${n-1}`) }}</option>
+ </select>
+ </label>
+ <label class="select-box">
+ <span class="select-label">{{ $t('opt:preload') }}</span>
+ <select class="form-control" v-model="tripleCtrlPreload">
+ <option value="">{{ $t('opt:none') }}</option>
+ <option value="clipboard">{{ $t('opt:preload_clipboard') }}</option>
+ <option value="selection">{{ $t('opt:preload_selection') }}</option>
+ </select>
+ </label>
+ <label class="checkbox-inline">
+ <input type="checkbox" v-model="tripleCtrlAuto"> {{ $t('opt:preload_auto') }}
+ </label>
+ <label class="checkbox-inline">
+ <input type="checkbox" v-model="tripleCtrlStandalone"> {{ $t('opt:triple_ctrl_standalone') }}
+ </label>
+ </span>
+ </transition>
</div>
+ <transition name="fade">
+ <div v-if="tripleCtrl && tripleCtrlStandalone" class="checkbox">
+ <div class="input-group">
+ <div class="input-group-addon">{{ $t('opt:triple_ctrl_height') }}</div>
+ <input type="number" min="50" class="form-control" v-model.number="tripleCtrlHeight">
+ <div class="input-group-addon">px</div>
+ </div>
+ <label class="checkbox-inline">
+ <input type="checkbox" v-model="tripleCtrlPageSel"> {{ $t('opt:triple_ctrl_page_selection') }}
+ </label>
+ </div>
+ </transition>
+ <transition name="fade">
+ <div v-if="tripleCtrl && tripleCtrlStandalone && tripleCtrlPageSel">
+ <div class="checkbox">
+ <label class="checkbox-inline">
+ <input type="checkbox" v-model="qsPanelMode.direct"> {{ $t('opt:mode_direct') }}
+ </label>
+ <label class="checkbox-inline">
+ <input type="checkbox" v-model="qsPanelMode.double"> {{ $t('opt:mode_double') }}
+ </label>
+ <label class="checkbox-inline">
+ <input type="checkbox" v-model="qsPanelMode.ctrl"> {{ $t('opt:mode_ctrl') }}
+ </label>
+ <label class="checkbox-inline">
+ <input type="checkbox" v-model="qsPanelMode.instant.enable"> {{ $t('opt:mode_instant') }}
+ </label>
+ </div>
+ <div class="input-group" v-if="qsPanelMode.double">
+ <div class="input-group-addon">{{ $t('opt:mode_double_click_delay') }}</div>
+ <input type="number" min="1" class="form-control" v-model.number="doubleClickDelay">
+ <div class="input-group-addon">{{ $t('opt:unit_ms') }}</div>
+ </div>
+ <div class="instant-capture-container" v-if="qsPanelMode.instant.enable">
+ <label class="select-box">
+ <span class="select-label">{{ $t('opt:mode_instant_key') }}</span>
+ <select class="form-control" v-model="qsPanelMode.instant.key">
+ <option value="alt">{{ $t('opt:mode_instant_alt') }}</option>
+ <option value="ctrl">{{ $t('opt:mode_instant_ctrl') }}</option>
+ <option value="direct">{{ $t('opt:mode_instant_direct') }}</option>
+ </select>
+ </label>
+ <div class="input-group instant-capture-delay">
+ <div class="input-group-addon">{{ $t('opt:mode_instant_delay') }}</div>
+ <input type="number" min="1" class="form-control" v-model.number="qsPanelMode.instant.delay">
+ <div class="input-group-addon">{{ $t('opt:unit_ms') }}</div>
+ </div>
+ </div>
+ </div>
+ </transition>
</div>
<div class="opt-item__description-wrap">
<p class="opt-item__description" v-html="$t('opt:triple_ctrl_description')"></p>
@@ -40,6 +97,10 @@ export default {
tripleCtrlPreload: 'config.tripleCtrlPreload',
tripleCtrlAuto: 'config.tripleCtrlAuto',
tripleCtrlLocation: 'config.tripleCtrlLocation',
+ tripleCtrlStandalone: 'config.tripleCtrlStandalone',
+ tripleCtrlHeight: 'config.tripleCtrlHeight',
+ tripleCtrlPageSel: 'config.tripleCtrlPageSel',
+ qsPanelMode: 'config.qsPanelMode',
}
}
</script>
|
refactor
|
add quick search panel options
|
036d77d95d4018aa28d86dd7d5b3f66ce614332a
|
2019-12-28 23:00:04
|
crimx
|
refactor: let window manager ignore minimized main win
| false
|
diff --git a/src/background/windows-manager.ts b/src/background/windows-manager.ts
index 56d0121d3..032eaf43c 100644
--- a/src/background/windows-manager.ts
+++ b/src/background/windows-manager.ts
@@ -18,15 +18,20 @@ export class MainWindowsManager {
private snapshot: browser.windows.Window | null = null
async takeSnapshot(): Promise<browser.windows.Window | null> {
+ this.snapshot = null
+
try {
- return (this.snapshot = await browser.windows.getLastFocused({
+ const win = await browser.windows.getLastFocused({
windowTypes: ['normal']
- }))
+ })
+ if (win.state !== 'minimized') {
+ this.snapshot = win
+ }
} catch (e) {
console.warn(e)
}
- return (this.snapshot = null)
+ return this.snapshot
}
destroySnapshot(): void {
|
refactor
|
let window manager ignore minimized main win
|
2f58b21ea6cd7e020750b9cc3c3f67c3a359265e
|
2018-02-10 04:04:09
|
greenkeeper[bot]
|
chore(package): update autoprefixer to version 7.2.6
| false
|
diff --git a/package.json b/package.json
index 8cfcab2a7..3964af4ae 100644
--- a/package.json
+++ b/package.json
@@ -58,7 +58,7 @@
"@commitlint/config-conventional": "^6.0.2",
"@types/jest": "^22.0.1",
"@types/sinon-chrome": "^2.2.0",
- "autoprefixer": "7.2.5",
+ "autoprefixer": "7.2.6",
"babel-core": "6.26.0",
"babel-jest": "22.2.2",
"babel-loader": "7.1.2",
|
chore
|
update autoprefixer to version 7.2.6
|
4934e7c053842bc6076d8c384225545ea09bda98
|
2018-10-07 14:57:54
|
CRIMX
|
fix(locales): typo
| false
|
diff --git a/src/_locales/options/messages.json b/src/_locales/options/messages.json
index 91b64c6d3..75daf4e6a 100644
--- a/src/_locales/options/messages.json
+++ b/src/_locales/options/messages.json
@@ -270,7 +270,7 @@
"zh_TW": "例子"
},
"export": {
- "en": "Reset",
+ "en": "Export",
"zh_CN": "导出设定",
"zh_TW": "匯出設定"
},
|
fix
|
typo
|
c359b700d167a581071a785e65f31df2654dc69a
|
2018-05-28 20:06:51
|
CRIMX
|
fix(options): search text when options page is opened
| false
|
diff --git a/src/content/redux/modules/dictionaries.ts b/src/content/redux/modules/dictionaries.ts
index c7a8abfb9..caadd6eeb 100644
--- a/src/content/redux/modules/dictionaries.ts
+++ b/src/content/redux/modules/dictionaries.ts
@@ -263,6 +263,10 @@ export function startUpAction (): DispatcherThunk {
} else {
listenTrpleCtrl(dispatch, getState)
}
+
+ if (isSaladictOptionsPage) {
+ dispatch(searchText({ info: getDefaultSelectionInfo({ text: 'salad' }) }))
+ }
}
}
|
fix
|
search text when options page is opened
|
e52d122c59bd4f96ca14a46e17d687031143e0de
|
2020-06-01 14:04:03
|
crimx
|
refactor(sync-services): remove setMeta on init
| false
|
diff --git a/test/specs/background/sync-manager/services/webdav.spec.ts b/test/specs/background/sync-manager/services/webdav.spec.ts
index 319073188..ec54763a2 100644
--- a/test/specs/background/sync-manager/services/webdav.spec.ts
+++ b/test/specs/background/sync-manager/services/webdav.spec.ts
@@ -510,7 +510,7 @@ describe('Sync service WebDAV', () => {
expect(fetchInit.createDir).lastCalledWith(...fetchArgs.createDir(config))
expect(fetchInit.upload).toHaveBeenCalledTimes(0)
expect(fetchInit.download).toHaveBeenCalledTimes(0)
- expect(helpers.setMeta).toHaveBeenCalledTimes(1)
+ expect(helpers.setMeta).toHaveBeenCalledTimes(0)
expect(helpers.setNotebook).toHaveBeenCalledTimes(0)
})
@@ -574,7 +574,7 @@ describe('Sync service WebDAV', () => {
// expect(fetchInit.createDir).toHaveBeenCalledTimes(0)
expect(fetchInit.upload).toHaveBeenCalledTimes(0)
expect(fetchInit.download).toHaveBeenCalledTimes(0)
- expect(helpers.setMeta).toHaveBeenCalledTimes(1)
+ expect(helpers.setMeta).toHaveBeenCalledTimes(0)
expect(helpers.setNotebook).toHaveBeenCalledTimes(0)
})
|
refactor
|
remove setMeta on init
|
3b1add8ec711defe6366e742fc30773a0eb4d242
|
2018-05-31 03:09:37
|
CRIMX
|
docs(docs): update docs
| false
|
diff --git a/README.md b/README.md
index 9d1660929..e8be6333e 100644
--- a/README.md
+++ b/README.md
@@ -20,12 +20,9 @@ Chrome/Firefox WebExtension. Feature-rich inline translator with PDF support. Vi
<a href="https://github.com/crimx/crx-saladict/releases/" target="_blank"><img src="https://raw.githubusercontent.com/wiki/crimx/ext-saladict/images/notebook.gif" /></a>
</p>
-- Chrome Web Store: <https://chrome.google.com/webstore/detail/cdonnmffkdaoajfknoeeecmchibpmkmg>
-- crx: <https://github.com/crimx/crx-saladict/releases/>
-
-- Firefox Add-ons: <https://addons.mozilla.org/en-US/firefox/addon/ext-saladict/>
-- xpi: <https://github.com/crimx/crx-saladict/releases/>
+# Downloads
+[Chrome Web Store](https://chrome.google.com/webstore/detail/cdonnmffkdaoajfknoeeecmchibpmkmg)/[Firefox Add-ons](https://addons.mozilla.org/firefox/addon/ext-saladict/)/[Github Release](https://github.com/crimx/crx-saladict/releases/)
Saladict 6 is a complete rewrite in React Typescript for both Chrome & Firefox. Built for speed, stability and customization.
diff --git a/docs/_layouts/default.html b/docs/_layouts/default.html
index 0ed80d9bc..26d006de6 100644
--- a/docs/_layouts/default.html
+++ b/docs/_layouts/default.html
@@ -22,6 +22,7 @@
<h1 class="project-name">Saladict 沙拉查词</h1>
<h2 class="project-tagline">Chrome 浏览器插件，网页划词翻译。</h2>
<a href="https://chrome.google.com/webstore/detail/cdonnmffkdaoajfknoeeecmchibpmkmg" class="btn">进入 Chrome 商店</a>
+ <a href="https://addons.mozilla.org/firefox/addon/ext-saladict/" class="btn">进入 Firefox 商店</a>
<a href="{{ site.github.releases_url }}" class="btn">直接下载 crx</a>
<a href="{{ site.github.repository_url }}" class="btn">View on GitHub</a>
</section>
diff --git a/docs/index.md b/docs/index.md
index 8533a1c47..5e01c9029 100644
--- a/docs/index.md
+++ b/docs/index.md
@@ -14,12 +14,13 @@
Chrome/Firefox 浏览器插件，网页划词翻译。
+<p align="center">
+ <a href="https://github.com/crimx/crx-saladict/releases/" target="_blank"><img src="https://raw.githubusercontent.com/wiki/crimx/ext-saladict/images/notebook.gif" /></a>
+</p>
-- Chrome Web Store: <https://chrome.google.com/webstore/detail/cdonnmffkdaoajfknoeeecmchibpmkmg>
-- crx: <https://github.com/crimx/crx-saladict/releases/>
+# 下载
-- Firefox Add-ons: <https://addons.mozilla.org/en-US/firefox/addon/ext-saladict/>
-- xpi: <https://github.com/crimx/crx-saladict/releases/>
+[Chrome 商店](https://chrome.google.com/webstore/detail/cdonnmffkdaoajfknoeeecmchibpmkmg)/[Firefox 商店](https://addons.mozilla.org/firefox/addon/ext-saladict/)/[直接下载](https://github.com/crimx/crx-saladict/releases/)
[功能一览：](https://github.com/crimx/crx-saladict/wiki)
@@ -85,9 +86,9 @@ Chrome/Firefox 浏览器插件，网页划词翻译。
# 支持开发
-用爽了欢迎按上方的 ★Star 以及在[谷歌商店](https://chrome.google.com/webstore/detail/cdonnmffkdaoajfknoeeecmchibpmkmg/reviews)留好评。开发不易，懒癌晚期的作者身残志坚，以惊人的毅力克服病魔贡献代码，真是闻者伤心听者落泪。献出一份爱心，挽救一条生命。为保持本项目持久生命力，请给作者打赏杯咖啡 :coffee: ：
+用爽了欢迎按 Github 上方的 ★Star 以及在[谷歌商店](https://chrome.google.com/webstore/detail/cdonnmffkdaoajfknoeeecmchibpmkmg/reviews)留好评。开发不易，懒癌晚期的作者身残志坚，以惊人的毅力克服病魔贡献代码，真是闻者伤心听者落泪。献出一份爱心，挽救一条生命。为保持本项目持久生命力，请给作者打赏杯咖啡 :coffee: ：
<div align="center">
- <img width="250" height="250" src="images/wechat.png">
- <img width="250" height="250" src="images/alipay.png">
+ <img width="250" height="250" src="https://github.com/crimx/crx-saladict/wiki/images/wechat.png">
+ <img width="250" height="250" src="https://github.com/crimx/crx-saladict/wiki/images/alipay.png">
</div>
|
docs
|
update docs
|
3fa2fb622154c903a62dbb2782dcb6211d58fbfc
|
2019-01-07 18:57:35
|
CRIMX
|
perf: faster matching sentence head
| false
|
diff --git a/src/_helpers/selection.ts b/src/_helpers/selection.ts
index a3abc6d65..1eaf58158 100644
--- a/src/_helpers/selection.ts
+++ b/src/_helpers/selection.ts
@@ -31,75 +31,17 @@ export function getSelectionText (win = window): string {
return ''
}
-// match head a.b is ok chars that ends a sentence
-const sentenceHeadTester = /((\.(?![\s.?!。？！…]))|[^.?!。？！…])+$/
-// match tail for "..."
-const sentenceTailTester = /^((\.(?![\s.?!。？！…]))|[^.?!。？！…])*([.?!。？！…]){0,3}/
-
/** Returns the sentence containing the selection text */
export function getSelectionSentence (win = window): string {
const selection = win.getSelection()
const selectedText = selection.toString()
if (!selectedText.trim()) { return '' }
- let sentenceHead = ''
- let sentenceTail = ''
-
- const anchorNode = selection.anchorNode
- if (anchorNode.nodeType === Node.TEXT_NODE) {
- let leadingText = anchorNode.textContent || ''
- if (leadingText) {
- leadingText = leadingText.slice(0, selection.anchorOffset)
- }
- for (let node = anchorNode.previousSibling; node; node = node.previousSibling) {
- if (node.nodeType === Node.TEXT_NODE) {
- leadingText = node.textContent + leadingText
- } else if (node.nodeType === Node.ELEMENT_NODE) {
- leadingText = (node as HTMLElement).innerText + leadingText
- }
- }
-
- for (
- let element = anchorNode.parentElement;
- element && INLINE_TAGS.has(element.tagName.toLowerCase()) && element !== document.body;
- element = element.parentElement
- ) {
- for (let el = element.previousElementSibling; el; el = el.previousElementSibling) {
- leadingText = (el as HTMLElement).innerText + leadingText
- }
- }
-
- sentenceHead = (leadingText.match(sentenceHeadTester) || [''])[0]
- }
-
- const focusNode = selection.focusNode
- if (selection.focusNode.nodeType === Node.TEXT_NODE) {
- let tailingText = selection.focusNode.textContent || ''
- if (tailingText) {
- tailingText = tailingText.slice(selection.focusOffset)
- }
- for (let node = focusNode.nextSibling; node; node = node.nextSibling) {
- if (node.nodeType === Node.TEXT_NODE) {
- tailingText += node.textContent
- } else if (node.nodeType === Node.ELEMENT_NODE) {
- tailingText += (node as HTMLElement).innerText
- }
- }
-
- for (
- let element = focusNode.parentElement;
- element && INLINE_TAGS.has(element.tagName.toLowerCase()) && element !== document.body;
- element = element.parentElement
- ) {
- for (let el = element.nextElementSibling; el; el = el.nextElementSibling) {
- tailingText += (el as HTMLElement).innerText
- }
- }
-
- sentenceTail = (tailingText.match(sentenceTailTester) || [''])[0]
- }
-
- return cleanText(sentenceHead + selectedText + sentenceTail)
+ return cleanText(
+ extractSentenceHead(selection.anchorNode, selection.anchorOffset) +
+ selectedText +
+ extractSentenceTail(selection.focusNode, selection.focusOffset)
+ )
}
export type SelectionInfo = Readonly<SelectionInfoMutable>
@@ -160,3 +102,86 @@ export function getSelectionInfo (config: Partial<SelectionInfo> = {}): Selectio
function cleanText (text: string): string {
return text.replace(/\s+/g, ' ').trim()
}
+
+function extractSentenceHead (anchorNode: Node, anchorOffset: number): string {
+ if (anchorNode.nodeType === Node.TEXT_NODE) {
+ let leadingText = anchorNode.textContent || ''
+ if (leadingText) {
+ leadingText = leadingText.slice(0, anchorOffset)
+ }
+
+ // prev siblings
+ for (let node = anchorNode.previousSibling; node; node = node.previousSibling) {
+ if (node.nodeType === Node.TEXT_NODE) {
+ leadingText = (node.textContent || '') + leadingText
+ } else if (node.nodeType === Node.ELEMENT_NODE) {
+ leadingText = (node as HTMLElement).innerText + leadingText
+ }
+ }
+
+ // parent prev siblings
+ for (
+ let element = anchorNode.parentElement;
+ element && INLINE_TAGS.has(element.tagName.toLowerCase()) && element !== document.body;
+ element = element.parentElement
+ ) {
+ for (let el = element.previousElementSibling; el; el = el.previousElementSibling) {
+ leadingText = (el as HTMLElement).innerText + leadingText
+ }
+ }
+
+ const puncTester = /[.?!。？！…]/
+ /** meaningful char after dot "." */
+ const charTester = /[\s.?!。？！…]/
+
+ for (let i = leadingText.length - 1; i >= 0; i--) {
+ const c = leadingText[i]
+ if (puncTester.test(c)) {
+ if (c === '.' && charTester.test(c)) {
+ // a.b is allowed
+ continue
+ }
+ return leadingText.slice(i + 1)
+ }
+ }
+
+ return leadingText
+ }
+
+ return ''
+}
+
+function extractSentenceTail (focusNode: Node, focusOffset: number): string {
+ if (focusNode.nodeType === Node.TEXT_NODE) {
+ let tailingText = focusNode.textContent || ''
+ if (tailingText) {
+ tailingText = tailingText.slice(focusOffset)
+ }
+
+ // next siblings
+ for (let node = focusNode.nextSibling; node; node = node.nextSibling) {
+ if (node.nodeType === Node.TEXT_NODE) {
+ tailingText += node.textContent
+ } else if (node.nodeType === Node.ELEMENT_NODE) {
+ tailingText += (node as HTMLElement).innerText
+ }
+ }
+
+ // parent next siblings
+ for (
+ let element = focusNode.parentElement;
+ element && INLINE_TAGS.has(element.tagName.toLowerCase()) && element !== document.body;
+ element = element.parentElement
+ ) {
+ for (let el = element.nextElementSibling; el; el = el.nextElementSibling) {
+ tailingText += (el as HTMLElement).innerText
+ }
+ }
+
+ // match tail for "..."
+ const sentenceTailTester = /^((\.(?![\s.?!。？！…]))|[^.?!。？！…])*([.?!。？！…]){0,3}/
+ return (tailingText.match(sentenceTailTester) || [''])[0]
+ }
+
+ return ''
+}
|
perf
|
faster matching sentence head
|
da44eee3917a19f91d7bf160c8f4606f988e4773
|
2019-03-17 13:50:10
|
CRIMX
|
refactor(panel): remove speaker hovering
| false
|
diff --git a/src/components/Speaker/index.tsx b/src/components/Speaker/index.tsx
index 5af235833..eff291d67 100644
--- a/src/components/Speaker/index.tsx
+++ b/src/components/Speaker/index.tsx
@@ -27,15 +27,15 @@ export default class Speaker extends React.PureComponent<SpeakerProps, SpeakerSt
}
}
- handleMouseEnter = () => {
- if (this.state.isPlaying) { return }
- clearTimeout(this._playTimeout)
- this._playTimeout = setTimeout(() => this.playAudio(), 400)
- }
+ // handleMouseEnter = () => {
+ // if (this.state.isPlaying) { return }
+ // clearTimeout(this._playTimeout)
+ // this._playTimeout = setTimeout(() => this.playAudio(), 400)
+ // }
- handleMouseLeave = () => {
- clearTimeout(this._playTimeout)
- }
+ // handleMouseLeave = () => {
+ // clearTimeout(this._playTimeout)
+ // }
handleClick = (e: React.MouseEvent<HTMLButtonElement>) => {
e.currentTarget.blur()
@@ -66,8 +66,8 @@ export default class Speaker extends React.PureComponent<SpeakerProps, SpeakerSt
return (
<button
className={`icon-Speaker ${this.state.isPlaying ? 'isActive' : ''}`}
- onMouseEnter={this.handleMouseEnter}
- onMouseLeave={this.handleMouseLeave}
+ // onMouseEnter={this.handleMouseEnter}
+ // onMouseLeave={this.handleMouseLeave}
onClick={this.handleClick}
style={{ width, height }}
>
diff --git a/src/components/withStaticSpeaker.tsx b/src/components/withStaticSpeaker.tsx
index 71558ddd5..3944aaa69 100644
--- a/src/components/withStaticSpeaker.tsx
+++ b/src/components/withStaticSpeaker.tsx
@@ -11,52 +11,53 @@ export default function withStaticSpeaker<P> (
className = 'saladict-StaticSpeaker'
) {
return class StaticSpeaker extends React.PureComponent<P> {
- _audioDelayTimeout: any
+ // _audioDelayTimeout: any
- isAudioElement (evt: React.MouseEvent<HTMLDivElement>): boolean {
+ static isAudioElement (evt: React.MouseEvent<HTMLDivElement>): boolean {
const target = (evt.target as HTMLElement)
const cls = target.classList
return cls && cls.contains(className)
}
- handleDictMouseOver = (evt: React.MouseEvent<HTMLDivElement>) => {
- if (this.isAudioElement(evt)) {
- clearTimeout(this._audioDelayTimeout)
- // React resuses synthetic event object
- const target = evt.target as HTMLElement
- this._audioDelayTimeout =
- setTimeout(() => this.playAudio(target), 400)
- }
- }
+ // handleDictMouseOver = (evt: React.MouseEvent<HTMLDivElement>) => {
+ // if (this.isAudioElement(evt)) {
+ // clearTimeout(this._audioDelayTimeout)
+ // // React resuses synthetic event object
+ // const target = evt.target as HTMLElement
+ // this._audioDelayTimeout =
+ // setTimeout(() => this.playAudio(target), 400)
+ // }
+ // }
- handleDictMouseOut = (evt: React.MouseEvent<HTMLDivElement>) => {
- if (this.isAudioElement(evt)) {
- clearTimeout(this._audioDelayTimeout)
- }
- }
+ // handleDictMouseOut = (evt: React.MouseEvent<HTMLDivElement>) => {
+ // if (this.isAudioElement(evt)) {
+ // clearTimeout(this._audioDelayTimeout)
+ // }
+ // }
handleDictClick = (evt: React.MouseEvent<HTMLDivElement>) => {
- if (this.isAudioElement(evt)) {
- clearTimeout(this._audioDelayTimeout)
- const target = evt.target as HTMLElement
- target.blur()
- this.playAudio(target)
+ if (StaticSpeaker.isAudioElement(evt)) {
+ // clearTimeout(this._audioDelayTimeout)
+ const src = evt.target && evt.target['dataset'] && evt.target['dataset'].srcMp3
+ if (src) {
+ message.send<MsgAudioPlay>({ type: MsgType.PlayAudio, src })
+ }
}
}
- playAudio = (target: HTMLElement) => {
- const src = target.dataset.srcMp3
- if (src) {
- message.send<MsgAudioPlay>({ type: MsgType.PlayAudio, src })
- }
- }
+ // playAudio = (target: HTMLElement) => {
+ // const src = target.dataset.srcMp3
+ // if (src) {
+ // message.send<MsgAudioPlay>({ type: MsgType.PlayAudio, src })
+ // }
+ // }
render () {
return (
<div
onClick={this.handleDictClick}
- onMouseOver={this.handleDictMouseOver}
- onMouseOut={this.handleDictMouseOut}
+ // onMouseOver={this.handleDictMouseOver}
+ // onMouseOut={this.handleDictMouseOut}
>
<WrapComponent {...this.props} />
</div>
|
refactor
|
remove speaker hovering
|
37132393ce32a312cc3ebbe032294d6a86281b31
|
2018-02-04 11:25:32
|
CRIMX
|
chore(package): update web-ext-types
| false
|
diff --git a/yarn.lock b/yarn.lock
index 7f68d8034..9eae9436d 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -8218,8 +8218,8 @@ wbuf@^1.1.0, wbuf@^1.7.2:
minimalistic-assert "^1.0.0"
web-ext-types@crimx/web-ext-types:
- version "1.1.6"
- resolved "https://codeload.github.com/crimx/web-ext-types/tar.gz/f43910e7cb71d6d5dca3616027c8024887af9b6b"
+ version "1.1.8"
+ resolved "https://codeload.github.com/crimx/web-ext-types/tar.gz/15111f8c6d8a111a6419de8ac624b132068a43bb"
webextension-polyfill@^0.2.1:
version "0.2.1"
|
chore
|
update web-ext-types
|
9379ca3d0c514dc5808c75bb6e9f76e7d66056e9
|
2020-04-21 15:30:20
|
crimx
|
refactor(options): reset entry when language changes
| false
|
diff --git a/src/options/components/MainEntry.tsx b/src/options/components/MainEntry.tsx
index c160a6ad1..c117a86c5 100644
--- a/src/options/components/MainEntry.tsx
+++ b/src/options/components/MainEntry.tsx
@@ -4,7 +4,7 @@ import { Layout, Row, Col, message as antMsg, notification } from 'antd'
import { useObservablePickState, useSubscription } from 'observable-hooks'
import { reportGA } from '@/_helpers/analytics'
import { ErrorBoundary } from '@/components/ErrorBoundary'
-import { useTranslate } from '@/_helpers/i18n'
+import { useTranslate, I18nContext } from '@/_helpers/i18n'
import { EntrySideBarMemo } from './EntrySideBar'
import { HeaderMemo } from './Header'
import { EntryError } from './EntryError'
@@ -17,6 +17,7 @@ const EntryComponent = React.memo(({ entry }: { entry: string }) =>
)
export const MainEntry: FC = () => {
+ const lang = useContext(I18nContext)
const { t, ready } = useTranslate('options')
const globals = useContext(GlobalsContext)
const [entry, setEntry] = useState(getEntry)
@@ -83,7 +84,7 @@ export const MainEntry: FC = () => {
backgroundColor: 'var(--opt-background-color)'
}}
>
- <ErrorBoundary key={entry} error={EntryError}>
+ <ErrorBoundary key={entry + lang} error={EntryError}>
{ready && <EntryComponent entry={entry} />}
</ErrorBoundary>
</Layout.Content>
|
refactor
|
reset entry when language changes
|
35f399e3b85a95153231bdee013ea8bd475fe117
|
2018-04-29 17:19:09
|
CRIMX
|
style(content): split styles
| false
|
diff --git a/src/content/components/DictItem/index.tsx b/src/content/components/DictItem/index.tsx
index d54c2a670..ee5c26447 100644
--- a/src/content/components/DictItem/index.tsx
+++ b/src/content/components/DictItem/index.tsx
@@ -1,4 +1,3 @@
-import './_style.scss'
import React from 'react'
import { DictID } from '@/app-config'
import { translate } from 'react-i18next'
diff --git a/src/content/components/DictPanel/index.tsx b/src/content/components/DictPanel/index.tsx
index 8781a24f1..31b150c0e 100644
--- a/src/content/components/DictPanel/index.tsx
+++ b/src/content/components/DictPanel/index.tsx
@@ -1,4 +1,3 @@
-import './panel.scss'
import React from 'react'
import { DictionariesState } from '../../redux/modules/dictionaries'
import { AppConfig, DictID } from '@/app-config'
@@ -27,7 +26,7 @@ export interface DictPanelProps extends DictPanelDispatchers {
export default class DictPanel extends React.Component<DictPanelProps> {
frameHead = '<meta name="viewport" content="width=device-width, initial-scale=1">\n' + (
process.env.NODE_ENV === 'production'
- ? `<link type="text/css" rel="stylesheet" href="${browser.runtime.getURL('content.css')}" />`
+ ? `<link type="text/css" rel="stylesheet" href="${browser.runtime.getURL('panel.css')}" />`
: Array.from(document.querySelectorAll<HTMLLinkElement>('link[rel="stylesheet"]'))
.map(link => link.outerHTML)
.join('\n')
diff --git a/src/content/components/DictPanel/panel.scss b/src/content/components/DictPanel/panel.scss
index 36435f595..197d9119e 100644
--- a/src/content/components/DictPanel/panel.scss
+++ b/src/content/components/DictPanel/panel.scss
@@ -1,3 +1,10 @@
+/*-----------------------------------------------*\
+ Variables
+\*-----------------------------------------------*/
+@import '../../../_sass_global/variables';
+@import '../../../_sass_global/z-indices';
+@import '../../../_sass_global/interfaces';
+
/*-----------------------------------------------*\
Libs
\*-----------------------------------------------*/
@@ -32,3 +39,9 @@ body {
overflow-x: hidden;
overflow-y: scroll;
}
+
+/*-----------------------------------------------*\
+ Components
+\*-----------------------------------------------*/
+@import '../MenuBar/style';
+@import '../DictItem/style';
diff --git a/src/content/components/DictPanelPortal/_style.scss b/src/content/components/DictPanelPortal/_style.scss
index 495ee2b15..a1f0b11a9 100644
--- a/src/content/components/DictPanelPortal/_style.scss
+++ b/src/content/components/DictPanelPortal/_style.scss
@@ -1,7 +1,3 @@
-@import '@/_sass_global/variables';
-@import '@/_sass_global/z-indices';
-@import '@/_sass_global/interfaces';
-
:root:root:root:root:root {
.saladict-DictPanel {
@extend %reset-important;
diff --git a/src/content/components/DictPanelPortal/index.tsx b/src/content/components/DictPanelPortal/index.tsx
index 1e0fbec15..07abce17c 100644
--- a/src/content/components/DictPanelPortal/index.tsx
+++ b/src/content/components/DictPanelPortal/index.tsx
@@ -1,4 +1,3 @@
-import './_style.scss'
import React from 'react'
import ReactDOM from 'react-dom'
import { Spring } from 'react-spring'
@@ -212,16 +211,11 @@ export default class DictPanelPortal extends React.Component<DictPanelPortalProp
render () {
const {
- selection,
- config,
- isPinned,
shouldPanelShow,
} = this.props
const { x, y, height, isDragging } = this.state
- const { direct, ctrl, double } = config.mode
-
if (shouldPanelShow && !this.isMount) {
this.mountEL()
}
diff --git a/src/content/components/MenuBar/index.tsx b/src/content/components/MenuBar/index.tsx
index 36ad3f5a9..7873e6b64 100644
--- a/src/content/components/MenuBar/index.tsx
+++ b/src/content/components/MenuBar/index.tsx
@@ -1,4 +1,3 @@
-import './_style.scss'
import React from 'react'
import { translate } from 'react-i18next'
import { message } from '@/_helpers/browser-api'
diff --git a/src/content/components/SaladBowl/_style.scss b/src/content/components/SaladBowl/_style.scss
index 71a2a6cc9..88445928d 100644
--- a/src/content/components/SaladBowl/_style.scss
+++ b/src/content/components/SaladBowl/_style.scss
@@ -1,7 +1,3 @@
-@import '@/_sass_global/variables';
-@import '@/_sass_global/z-indices';
-@import '@/_sass_global/interfaces';
-
$bowl-width: 30px;
$tomato-rotate: 45deg;
$leaf-rotate: 30deg;
diff --git a/src/content/components/SaladBowl/index.tsx b/src/content/components/SaladBowl/index.tsx
index 02f271748..808e40fda 100644
--- a/src/content/components/SaladBowl/index.tsx
+++ b/src/content/components/SaladBowl/index.tsx
@@ -1,4 +1,3 @@
-import './_style.scss'
import React from 'react'
import { Spring, SpringConfig } from 'react-spring'
diff --git a/src/content/content.scss b/src/content/content.scss
index 6f3a20c4d..2d78d441e 100644
--- a/src/content/content.scss
+++ b/src/content/content.scss
@@ -4,3 +4,9 @@
@import '../_sass_global/variables';
@import '../_sass_global/z-indices';
@import '../_sass_global/interfaces';
+
+/*-----------------------------------------------*\
+ Components
+\*-----------------------------------------------*/
+@import './components/SaladBowl/style';
+@import './components/DictPanelPortal/style';
diff --git a/src/panel/index.ts b/src/panel/index.ts
new file mode 100644
index 000000000..b3c4e2ee1
--- /dev/null
+++ b/src/panel/index.ts
@@ -0,0 +1 @@
+import '@/content/components/DictPanel/panel.scss'
|
style
|
split styles
|
e13b51edcf1176f4de54c7886e63f5ae44b40262
|
2019-02-23 17:52:57
|
CRIMX
|
fix: better korean rendering
| false
|
diff --git a/src/content/components/DictPanel/_style.scss b/src/content/components/DictPanel/_style.scss
index c07bf1abf..cf22a1cac 100644
--- a/src/content/components/DictPanel/_style.scss
+++ b/src/content/components/DictPanel/_style.scss
@@ -15,7 +15,7 @@
padding: 0;
background-color: #fff;
font-size: 14px;
- font-family: "Helvetica Neue", Helvetica, Arial, "Hiragino Sans GB", "Hiragino Sans GB W3", "Microsoft YaHei UI", "Microsoft YaHei", "WenQuanYi Micro Hei", sans-serif;
+ font-family: "Helvetica Neue", Helvetica, Arial, "Hiragino Sans GB", "Hiragino Sans GB W3", "Microsoft YaHei UI", "Microsoft YaHei", sans-serif;
-webkit-font-smoothing: antialiased;
text-rendering: optimizeLegibility;
diff --git a/src/content/components/WordEditor/_style.scss b/src/content/components/WordEditor/_style.scss
index 7b24bf648..13061186c 100644
--- a/src/content/components/WordEditor/_style.scss
+++ b/src/content/components/WordEditor/_style.scss
@@ -34,7 +34,7 @@ body {
color: #333;
background-color: rgba(0, 0, 0, 0.4);
font-size: 14px;
- font-family: "Helvetica Neue", Helvetica, Arial, "Hiragino Sans GB", "Hiragino Sans GB W3", "Microsoft YaHei UI", "Microsoft YaHei", "WenQuanYi Micro Hei", sans-serif;
+ font-family: "Helvetica Neue", Helvetica, Arial, "Hiragino Sans GB", "Hiragino Sans GB W3", "Microsoft YaHei UI", "Microsoft YaHei", sans-serif;
}
label {
diff --git a/src/popup/_style.scss b/src/popup/_style.scss
index cb32c9579..bb2d4bbb1 100644
--- a/src/popup/_style.scss
+++ b/src/popup/_style.scss
@@ -12,7 +12,7 @@ body {
margin: 0;
padding: 0;
overflow: hidden;
- font-family: "Helvetica Neue", Helvetica, Arial, "Hiragino Sans GB", "Hiragino Sans GB W3", "Microsoft YaHei UI", "Microsoft YaHei", "WenQuanYi Micro Hei", sans-serif;
+ font-family: "Helvetica Neue", Helvetica, Arial, "Hiragino Sans GB", "Hiragino Sans GB W3", "Microsoft YaHei UI", "Microsoft YaHei", sans-serif;
}
#frame-root {
|
fix
|
better korean rendering
|
ee5b794857508829a316599fd08b35d7c42e8bd5
|
2018-07-19 09:31:10
|
CRIMX
|
fix(selection): ignore right click #166
| false
|
diff --git a/src/selection/index.ts b/src/selection/index.ts
index 25eccca12..270311c85 100644
--- a/src/selection/index.ts
+++ b/src/selection/index.ts
@@ -123,7 +123,9 @@ merge(
* 2. Event target is not a Saladict exposed element.
*/
const validMouseup$$ = merge(
- fromEvent<MouseEvent>(window, 'mouseup', { capture: true }),
+ fromEvent<MouseEvent>(window, 'mouseup', { capture: true }).pipe(
+ filter(e => e.button === 0)
+ ),
fromEvent<TouchEvent>(window, 'touchend', { capture: true }).pipe(
map(e => e.changedTouches[0])
),
|
fix
|
ignore right click #166
|
7cf004e869192bf0eb06d27fe5a6d4508830dab1
|
2018-05-28 14:47:32
|
CRIMX
|
test(panel): update snapshots
| false
|
diff --git a/test/specs/components/content/__snapshots__/DictItem.spec.tsx.snap b/test/specs/components/content/__snapshots__/DictItem.spec.tsx.snap
index 1ff957e8c..c474885ac 100644
--- a/test/specs/components/content/__snapshots__/DictItem.spec.tsx.snap
+++ b/test/specs/components/content/__snapshots__/DictItem.spec.tsx.snap
@@ -57,7 +57,6 @@ exports[`Component/content/DictItem should render pending correctly 1`] = `
hold={false}
immediate={true}
impl={[Function]}
- inject={[Function]}
native={false}
reset={false}
to={
diff --git a/test/specs/components/content/__snapshots__/SaladBowl.spec.tsx.snap b/test/specs/components/content/__snapshots__/SaladBowl.spec.tsx.snap
index 0750d2162..a95a56f8f 100644
--- a/test/specs/components/content/__snapshots__/SaladBowl.spec.tsx.snap
+++ b/test/specs/components/content/__snapshots__/SaladBowl.spec.tsx.snap
@@ -24,7 +24,6 @@ exports[`Component/content/SaladBowl should render correctly 1`] = `
hold={false}
immediate={false}
impl={[Function]}
- inject={[Function]}
native={false}
reset={false}
to={
|
test
|
update snapshots
|
942e8a096ee760edac5a9f0aa71994eae1acf7ad
|
2021-08-21 14:18:59
|
dependabot[bot]
|
build(deps): bump lodash from 4.17.19 to 4.17.21 (#1319)
| false
|
diff --git a/package.json b/package.json
index 9c3e7ebf..fb3946b2 100644
--- a/package.json
+++ b/package.json
@@ -82,7 +82,7 @@
"dompurify": "^2.0.17",
"get-selection-more": "^1.0.2",
"i18next": "^17.0.6",
- "lodash": "^4.17.14",
+ "lodash": "^4.17.21",
"md5": "^2.2.1",
"memoize-one": "^5.1.0",
"normalize-scss": "^7.0.1",
diff --git a/yarn.lock b/yarn.lock
index 72852415..58081030 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -9915,15 +9915,10 @@ lodash.union@^4.6.0:
resolved "https://registry.yarnpkg.com/lodash.union/-/lodash.union-4.6.0.tgz#48bb5088409f16f1821666641c44dd1aaae3cd88"
integrity sha1-SLtQiECfFvGCFmZkHETdGqrjzYg=
-lodash@^4.0.1, lodash@^4.16.3, lodash@^4.17.11, lodash@^4.17.12, lodash@^4.17.13, lodash@^4.17.14, lodash@^4.17.15:
- version "4.17.19"
- resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.19.tgz#e48ddedbe30b3321783c5b4301fbd353bc1e4a4b"
- integrity sha512-JNvd8XER9GQX0v2qJgsaN/mzFCNA5BRe/j8JN9d+tWyGLSodKQHKFicdwNYzWwI3wjRnaKPsGj1XkBjx/F96DQ==
-
-lodash@^4.17.19, lodash@^4.17.20:
- version "4.17.20"
- resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.20.tgz#b44a9b6297bcb698f1c51a3545a2b3b368d59c52"
- integrity sha512-PlhdFcillOINfeV7Ni6oF1TAEayyZBoZ8bcshTHqOYJYlrqzRK5hagpagky5o4HfCzzd1TRkXPMFq6cKk9rGmA==
+lodash@^4.0.1, lodash@^4.16.3, lodash@^4.17.11, lodash@^4.17.12, lodash@^4.17.13, lodash@^4.17.14, lodash@^4.17.15, lodash@^4.17.19, lodash@^4.17.20, lodash@^4.17.21:
+ version "4.17.21"
+ resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.21.tgz#679591c564c3bffaae8454cf0b3df370c3d6911c"
+ integrity sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==
log-symbols@^2.1.0:
version "2.2.0"
|
build
|
bump lodash from 4.17.19 to 4.17.21 (#1319)
|
0f976b59dfc7a2335151956aff1147f6c8facd3e
|
2018-04-25 18:10:57
|
CRIMX
|
refactor(component): remove important styles
| false
|
diff --git a/src/components/PortalFrame.tsx b/src/components/PortalFrame.tsx
index a32abbd90..9f968d056 100644
--- a/src/components/PortalFrame.tsx
+++ b/src/components/PortalFrame.tsx
@@ -84,7 +84,6 @@ const EVENTS = [
export type PortalFrameProps = {
head?: string
name?: string
- importantStyle?: { [k: string]: string }
frameDidMount?: (ref: HTMLIFrameElement) => any
frameDidLoad?: (ref: HTMLIFrameElement) => any
frameWillUnmount?: () => any
@@ -121,22 +120,11 @@ export default class PortalFrame extends React.PureComponent<PortalFrameProps, P
})
}
- _applyImportantStyle () {
- const importantStyle = this.props.importantStyle
- if (importantStyle && this.frame) {
- const iframeStyle = this.frame.style
- Object.keys(importantStyle).forEach(key => {
- iframeStyle.setProperty(key, importantStyle[key], 'important')
- })
- }
- }
-
componentDidMount () {
const frame = this.frame as HTMLIFrameElement
if (this.props.frameDidMount) {
this.props.frameDidMount(frame)
}
- this._applyImportantStyle()
frame && frame.addEventListener('load', this._handleLoad, true)
}
@@ -151,10 +139,6 @@ export default class PortalFrame extends React.PureComponent<PortalFrameProps, P
this.state['root'] = null
}
- componentDidUpdate () {
- this._applyImportantStyle()
- }
-
render () {
const {
importantStyle,
|
refactor
|
remove important styles
|
a0470af418ac2a17d4afcaad4e77b0500daa5754
|
2018-11-01 13:40:21
|
CRIMX
|
test(sync): update initserver
| false
|
diff --git a/test/specs/background/sync-manager/services/webdav.spec.ts b/test/specs/background/sync-manager/services/webdav.spec.ts
index 0186f5e93..4586a0324 100644
--- a/test/specs/background/sync-manager/services/webdav.spec.ts
+++ b/test/specs/background/sync-manager/services/webdav.spec.ts
@@ -452,8 +452,8 @@ describe('Sync service WebDAV', () => {
mockFetch(config, fetchInit)
- const err = await initServer(config).catch(err => err)
- expect(err).toBeUndefined()
+ const { error } = await initServer(config)
+ expect(error).toBeUndefined()
expect(fetchInit.checkServer).toHaveBeenCalledTimes(1)
expect(fetchInit.checkServer).lastCalledWith(...fetchArgs.checkServer(config))
expect(fetchInit.createDir).toHaveBeenCalledTimes(1)
@@ -506,8 +506,8 @@ describe('Sync service WebDAV', () => {
}))
mockFetch(config, fetchInit)
- const err = await initServer(config).catch(err => err)
- expect(err).toBeUndefined()
+ const { error } = await initServer(config)
+ expect(error).toBeUndefined()
expect(fetchInit.checkServer).toHaveBeenCalledTimes(1)
expect(fetchInit.checkServer).lastCalledWith(...fetchArgs.checkServer(config))
// @upstream JSDOM missing namespace selector support
@@ -535,8 +535,8 @@ describe('Sync service WebDAV', () => {
mockFetch(config, fetchInit)
- const err = await initServer(config).catch(err => err)
- expect(err).toBe('network')
+ const { error } = await initServer(config)
+ expect(error).toBe('network')
expect(fetchInit.checkServer).toHaveBeenCalledTimes(1)
expect(fetchInit.checkServer).lastCalledWith(...fetchArgs.checkServer(config))
// @upstream JSDOM missing namespace selector support
@@ -564,8 +564,8 @@ describe('Sync service WebDAV', () => {
mockFetch(config, fetchInit)
- const err = await initServer(config).catch(err => err)
- expect(err).toBe('mkcol')
+ const { error } = await initServer(config)
+ expect(error).toBe('mkcol')
expect(fetchInit.checkServer).toHaveBeenCalledTimes(1)
expect(fetchInit.checkServer).lastCalledWith(...fetchArgs.checkServer(config))
expect(fetchInit.createDir).toHaveBeenCalledTimes(1)
@@ -619,8 +619,8 @@ describe('Sync service WebDAV', () => {
// }))
// mockFetch(config, fetchInit)
- // const err = await initServer(config).catch(err => err)
- // expect(err).toBe('exist')
+ // c{ onsor t} err = await initServer(config)
+ // exerrort(err).toBe('exist')
// expect(fetchInit.checkServer).toHaveBeenCalledTimes(1)
// expect(fetchInit.checkServer).lastCalledWith(...fetchArgs.checkServer(config))
// // @upstream JSDOM missing namespace selector support
|
test
|
update initserver
|
8dc50923e655ffa9dc10566023c5bad672aa8b99
|
2018-05-19 20:10:20
|
CRIMX
|
fix(assets): assets to static
| false
|
diff --git a/src/_helpers/browser-api.ts b/src/_helpers/browser-api.ts
index b1023e396..38628e207 100644
--- a/src/_helpers/browser-api.ts
+++ b/src/_helpers/browser-api.ts
@@ -429,8 +429,8 @@ function _getPageInfo (sender) {
} else {
// FRAGILE: Assume only browser action page is tabless
result.pageId = 'popup'
- if (sender.url && sender.url.startsWith('chrome')) {
- result.faviconURL = browser.runtime.getURL('assets/icon-16.png')
+ if (sender.url && !sender.url.startsWith('http')) {
+ result.faviconURL = 'https://raw.githubusercontent.com/crimx/ext-saladict/2ba9d2e85ad4ac2e4bb16ee43498ac4b58ed21a6/public/static/icon-16.png'
}
}
return result
diff --git a/src/background/initialization.ts b/src/background/initialization.ts
index 45faf27ab..3efe093d2 100644
--- a/src/background/initialization.ts
+++ b/src/background/initialization.ts
@@ -60,7 +60,7 @@ function onStartup (): void {
if (isAvailable) {
browser.notifications.create('update', {
type: 'basic',
- iconUrl: browser.runtime.getURL(`assets/icon-128.png`),
+ iconUrl: browser.runtime.getURL(`static/icon-128.png`),
title: '沙拉查词',
message: (`可更新至【${info.tag_name}】`
),
@@ -90,7 +90,7 @@ function showNews () {
if (data && data.tag_name) {
browser.notifications.create('oninstall', {
type: 'basic',
- iconUrl: browser.runtime.getURL(`assets/icon-128.png`),
+ iconUrl: browser.runtime.getURL(`static/icon-128.png`),
title: `沙拉查词 Saladict【${data.tag_name}】`,
message: data.body.match(/^\d+\..+/gm).join('\n'),
buttons: [{ title: '查看更新' }],
diff --git a/src/background/pdf-sniffer.ts b/src/background/pdf-sniffer.ts
index 70aa38f1f..a69bbbbbd 100644
--- a/src/background/pdf-sniffer.ts
+++ b/src/background/pdf-sniffer.ts
@@ -68,7 +68,7 @@ function stopListening () {
function otherPdfListener ({ url }) {
return {
- redirectUrl: browser.runtime.getURL(`assets/pdf/web/viewer.html?file=${encodeURIComponent(url)}`)
+ redirectUrl: browser.runtime.getURL(`static/pdf/web/viewer.html?file=${encodeURIComponent(url)}`)
}
}
@@ -82,7 +82,7 @@ function httpPdfListener ({ responseHeaders, url }: { responseHeaders?: browser.
(contentType === 'application/octet-stream' && url.endsWith('.pdf'))
) {
return {
- redirectUrl: browser.runtime.getURL(`assets/pdf/web/viewer.html?file=${encodeURIComponent(url)}`)
+ redirectUrl: browser.runtime.getURL(`static/pdf/web/viewer.html?file=${encodeURIComponent(url)}`)
}
}
}
|
fix
|
assets to static
|
e66c7f47cfeb32d8be3d7ba5b43095723ccd308c
|
2019-09-18 15:10:02
|
crimx
|
refactor(dicts): update google api
| false
|
diff --git a/src/components/dictionaries/google/engine.ts b/src/components/dictionaries/google/engine.ts
index 5048f34d3..c8fa420fc 100644
--- a/src/components/dictionaries/google/engine.ts
+++ b/src/components/dictionaries/google/engine.ts
@@ -138,16 +138,29 @@ async function fetchWithToken(
}
if (tk) {
- const params = new URLSearchParams(
- `?client=t&hl=en&dt=at&dt=bd&dt=ex&dt=ld&dt=md&dt=qca&dt=rw&dt=rm&dt=ss&dt=t&ie=UTF-8&oe=UTF-8&otf=1&ssel=0&tsel=0&kc=5`
- )
- params.append('sl', sl)
- params.append('tl', tl)
- params.append('tk', tk)
- params.append('q', text)
-
const json = await fetchPlainText(`${base}/translate_a/single`, {
- params
+ params: new URLSearchParams([
+ ['client', 'webapp'],
+ ['sl', sl],
+ ['tl', tl],
+ ['hl', 'en'],
+ ['dt', 'at'],
+ ['dt', 'bd'],
+ ['dt', 'ex'],
+ ['dt', 'ld'],
+ ['dt', 'md'],
+ ['dt', 'qca'],
+ ['dt', 'rw'],
+ ['dt', 'rm'],
+ ['dt', 'ss'],
+ ['dt', 't'],
+ ['source', 'bh'],
+ ['ssel', '0'],
+ ['tsel', '0'],
+ ['kc', '1'],
+ ['tk', tk],
+ ['q', text]
+ ])
})
return { json, base, sl, tl, tk1, tk2, text }
|
refactor
|
update google api
|
e3473140c4ca412bc0f7ccf9fa416f19b9f320b4
|
2020-07-07 14:39:41
|
crimx
|
refactor(components): tweak dict item head style
| false
|
diff --git a/src/content/components/DictItem/DictItemHead.scss b/src/content/components/DictItem/DictItemHead.scss
index 8f289ac78..afcf846a4 100644
--- a/src/content/components/DictItem/DictItemHead.scss
+++ b/src/content/components/DictItem/DictItemHead.scss
@@ -36,7 +36,7 @@
.dictItemHead-Menus_Btn {
width: 18px;
height: 18px;
- margin: 2px 0 0;
+ margin: 1px 0 0;
padding: 0;
font-size: 0;
border: none;
|
refactor
|
tweak dict item head style
|
6f619fd607cf587bbf316e3fa0feb3b59ffa0545
|
2018-09-13 15:14:07
|
CRIMX
|
test(panel): update snapshot
| false
|
diff --git a/test/specs/components/content/__snapshots__/MenuBar.spec.tsx.snap b/test/specs/components/content/__snapshots__/MenuBar.spec.tsx.snap
index 6e4e7b744..b2f6c3895 100644
--- a/test/specs/components/content/__snapshots__/MenuBar.spec.tsx.snap
+++ b/test/specs/components/content/__snapshots__/MenuBar.spec.tsx.snap
@@ -84,8 +84,8 @@ exports[`Component/content/MenuBar should render correctly 1`] = `
disabled={false}
onClick={[Function]}
onKeyUp={[Function]}
- onMouseEnter={[Function]}
- onMouseLeave={[Function]}
+ onMouseOut={[Function]}
+ onMouseOver={[Function]}
>
<svg
className="panel-MenuBar_Icon"
@@ -280,8 +280,8 @@ exports[`Component/content/MenuBar should render correctly with fav and pin 1`]
disabled={false}
onClick={[Function]}
onKeyUp={[Function]}
- onMouseEnter={[Function]}
- onMouseLeave={[Function]}
+ onMouseOut={[Function]}
+ onMouseOver={[Function]}
>
<svg
className="panel-MenuBar_Icon"
|
test
|
update snapshot
|
24564a8c075dfef157bb63aaf402127105c205c3
|
2019-09-19 00:31:00
|
crimx
|
refactor(popup): add dark mode
| false
|
diff --git a/.neutrinorc.js b/.neutrinorc.js
index 6e3323dd7..5ddbc060b 100644
--- a/.neutrinorc.js
+++ b/.neutrinorc.js
@@ -39,7 +39,8 @@ module.exports = {
'19': 'assets/icon-19.png',
'38': 'assets/icon-38.png'
}
- }
+ },
+ setup: 'popup/__fake__/env.ts'
}
},
diff --git a/src/popup/Popup.tsx b/src/popup/Popup.tsx
index 2dc26bf49..a42376c6a 100644
--- a/src/popup/Popup.tsx
+++ b/src/popup/Popup.tsx
@@ -67,7 +67,7 @@ export const Popup: FC<PopupProps> = props => {
}, [])
return (
- <div className="popup-root">
+ <div className={`popup-root${config.darkMode ? ' dark-mode' : ''}`}>
<DictPanelStandaloneContainer width={450} height={dictPanelHeight} />
<div
className="switch-container"
@@ -140,7 +140,12 @@ export const Popup: FC<PopupProps> = props => {
className="qrcode-panel"
onMouseLeave={() => setCurrentTabUrl('')}
>
- <QRCode value={currentTabUrl} size={250} />
+ <QRCode
+ value={currentTabUrl}
+ size={250}
+ bgColor={config.darkMode ? '#ddd' : '#fff'}
+ fgColor="#222"
+ />
<p className="qrcode-panel-title">
{isShowUrlBox ? (
<input
diff --git a/src/popup/__fake__/_style.scss b/src/popup/__fake__/_style.scss
index 7b2da8503..bfa7e604c 100644
--- a/src/popup/__fake__/_style.scss
+++ b/src/popup/__fake__/_style.scss
@@ -1,3 +1,3 @@
-#frame-root {
- background: #fff;
+body {
+ background: #ddd;
}
diff --git a/src/popup/__fake__/env.ts b/src/popup/__fake__/env.ts
new file mode 100644
index 000000000..6003aca8d
--- /dev/null
+++ b/src/popup/__fake__/env.ts
@@ -0,0 +1,13 @@
+import '../index'
+import './_style.scss'
+import { initConfig, updateConfig } from '@/_helpers/config-manager'
+
+async function main() {
+ const config = await initConfig()
+ await updateConfig({
+ ...config,
+ darkMode: true
+ })
+}
+
+main()
diff --git a/src/popup/__fake__/index.ts b/src/popup/__fake__/index.ts
deleted file mode 100644
index 808f9b41f..000000000
--- a/src/popup/__fake__/index.ts
+++ /dev/null
@@ -1,6 +0,0 @@
-import './_style.scss'
-import { initConfig } from '@/_helpers/config-manager'
-
-initConfig().then(() => {
- require('../index')
-})
diff --git a/src/popup/_style.scss b/src/popup/_style.scss
index 56975e93b..905097861 100644
--- a/src/popup/_style.scss
+++ b/src/popup/_style.scss
@@ -170,3 +170,39 @@ $switch-button-height: 35px;
opacity: 1;
transition: opacity 0.5s;
}
+
+.dark-mode {
+ background: #222;
+
+ .switch-container {
+ background: #414141;
+ }
+
+ .active-switch {
+ border-bottom-color: #666;
+ }
+
+ .switch-title {
+ color: #ddd;
+ }
+
+ .icon-qrcode {
+ fill: #ddd;
+ }
+
+ .btn-switch + label:before {
+ background-color: #666;
+ }
+
+ .btn-switch:checked + label:before {
+ background-color: #8ce196;
+ }
+
+ .btn-switch + label:after {
+ background-color: #ddd;
+ }
+
+ .qrcode-panel {
+ background-color: #ddd;
+ }
+}
|
refactor
|
add dark mode
|
83081bcbfeff1ad0acbe54f13da4372c6ce577ab
|
2018-03-04 16:59:05
|
greenkeeper[bot]
|
chore(package): update webpack to version 4.1.0
| false
|
diff --git a/package.json b/package.json
index 3fae04850..7e85b72fe 100644
--- a/package.json
+++ b/package.json
@@ -111,7 +111,7 @@
"vue-loader": "^14.0.0",
"vue-style-loader": "^4.0.0",
"vue-template-compiler": "^2.5.13",
- "webpack": "4.0.1",
+ "webpack": "4.1.0",
"webpack-dev-server": "3.1.0"
},
"jest": {
|
chore
|
update webpack to version 4.1.0
|
e5ef346a3626814bf9e90134d9ef524155b0ad27
|
2018-02-04 17:41:45
|
CRIMX
|
refactor(helpers): rewrite chs-to-chz
| false
|
diff --git a/src/_helpers/chs-to-chz.ts b/src/_helpers/chs-to-chz.ts
index 20e67dc46..dc32e62e1 100644
--- a/src/_helpers/chs-to-chz.ts
+++ b/src/_helpers/chs-to-chz.ts
@@ -2638,11 +2638,10 @@ const charMap = {
'龟': '龜'
}
-export default function chsToChz (text: string): string {
- text = String(text)
- const res: string[] = []
- for (let i = 0; i < text.length; i += 1) {
- res.push(charMap[text[i]] || text[i])
- }
- return res.join('')
+export function chsToChz (text: string): string {
+ return text.split('')
+ .map(c => charMap[c] || c)
+ .join('')
}
+
+export default chsToChz
diff --git a/test/unit/_helpers/chs-to-chz.spec.ts b/test/unit/_helpers/chs-to-chz.spec.ts
new file mode 100644
index 000000000..295c6ad9c
--- /dev/null
+++ b/test/unit/_helpers/chs-to-chz.spec.ts
@@ -0,0 +1,7 @@
+import chsToChz from '../../../src/_helpers/chs-to-chz'
+
+describe('Chs to Chz', () => {
+ it('should convert chs to chz', () => {
+ expect(chsToChz('龙龟')).toBe('龍龜')
+ })
+})
|
refactor
|
rewrite chs-to-chz
|
71ff8025b9d28f6a9b447816ec7a2c01a309efcc
|
2019-01-23 22:02:13
|
CRIMX
|
refactor: change max height to percentage
| false
|
diff --git a/src/app-config/index.ts b/src/app-config/index.ts
index 5f021f063..c6ec09803 100644
--- a/src/app-config/index.ts
+++ b/src/app-config/index.ts
@@ -61,8 +61,8 @@ function _getDefaultConfig () {
/** panel width */
panelWidth: 450,
- /** panel max height, 0 < n < 1 */
- panelMaxHeightRatio: 0.8,
+ /** panel max height in percentage, 0 < n < 100 */
+ panelMaxHeightRatio: 80,
/** panel font-size */
fontSize: 13,
diff --git a/src/app-config/merge-config.ts b/src/app-config/merge-config.ts
index 5cd241825..0bb5a4734 100644
--- a/src/app-config/merge-config.ts
+++ b/src/app-config/merge-config.ts
@@ -139,6 +139,10 @@ export function mergeConfig (oldConfig: AppConfig, baseConfig?: AppConfig): AppC
['^https://stackedit\.io(/.*)?$', 'https://stackedit.io/*']
)
}
+
+ if (base.panelMaxHeightRatio < 1) {
+ base.panelMaxHeightRatio = Math.round(base.panelMaxHeightRatio * 100)
+ }
// post-merge patch end
return base
diff --git a/src/content/components/DictPanel/index.tsx b/src/content/components/DictPanel/index.tsx
index d93ed15d2..db6b0cd96 100644
--- a/src/content/components/DictPanel/index.tsx
+++ b/src/content/components/DictPanel/index.tsx
@@ -78,7 +78,7 @@ export class DictPanel extends React.Component<DictPanelProps & { t: Translation
showMtaBox = (isShow: boolean) => {
this.setState({
mtaBoxHeight: isShow
- ? window.innerHeight * this.props.panelMaxHeightRatio * 0.4
+ ? window.innerHeight * this.props.panelMaxHeightRatio / 100 * 0.4
: 0
})
}
@@ -87,7 +87,7 @@ export class DictPanel extends React.Component<DictPanelProps & { t: Translation
if (e) { e.currentTarget.blur() }
this.setState(preState => {
return { mtaBoxHeight: preState.mtaBoxHeight <= 0
- ? window.innerHeight * this.props.panelMaxHeightRatio * 0.4
+ ? window.innerHeight * this.props.panelMaxHeightRatio / 100 * 0.4
: 0
}
})
diff --git a/src/content/redux/modules/widget.ts b/src/content/redux/modules/widget.ts
index 529f8addb..9fb6a45d2 100644
--- a/src/content/redux/modules/widget.ts
+++ b/src/content/redux/modules/widget.ts
@@ -128,7 +128,7 @@ export const initState: WidgetState = {
? window.innerWidth - _initConfig.panelWidth - 30
: 0,
y: isSaladictOptionsPage
- ? window.innerHeight * (1 - _initConfig.panelMaxHeightRatio) / 2
+ ? window.innerHeight * (1 - _initConfig.panelMaxHeightRatio / 100) / 2
: 0,
width: _initConfig.panelWidth,
height: panelHeaderHeight,
@@ -330,7 +330,7 @@ export const reducer: WidgetReducer = {
newState.widget.shouldPanelShow = true
newState.widget.panelRect = _reconcilePanelRect(
40,
- (1 - state.config.panelMaxHeightRatio) * window.innerHeight / 2,
+ (1 - state.config.panelMaxHeightRatio) * window.innerHeight / 100 / 2,
width,
height,
)
@@ -694,7 +694,7 @@ export function updateItemHeight (id: DictID | '_mtabox', height: number): Dispa
const winHeight = window.innerHeight
const newHeight = Math.min(
- winHeight * state.config.panelMaxHeightRatio,
+ winHeight * state.config.panelMaxHeightRatio / 100,
panelHeaderHeight +
(dictHeights._mtabox || 0) +
state.dictionaries.active
|
refactor
|
change max height to percentage
|
388edc02291debe97c994f5d3c6497d834d119cb
|
2018-09-23 21:28:27
|
CRIMX
|
fix(panel): dict info could be undefined
| false
|
diff --git a/src/content/components/DictPanel/index.tsx b/src/content/components/DictPanel/index.tsx
index 371c20264..d77bb0a22 100644
--- a/src/content/components/DictPanel/index.tsx
+++ b/src/content/components/DictPanel/index.tsx
@@ -1,5 +1,5 @@
import React from 'react'
-import { DictionariesState } from '../../redux/modules/dictionaries'
+import { DictionariesState, SearchStatus } from '../../redux/modules/dictionaries'
import { AppConfig, DictID, DictConfigs, MtaAutoUnfold } from '@/app-config'
import { SelectionInfo, getDefaultSelectionInfo } from '@/_helpers/selection'
import { MsgSelection } from '@/typings/message'
@@ -246,7 +246,7 @@ export class DictPanel extends React.Component<DictPanelProps & { t: Translation
if (typeof dictURL !== 'string') {
dictURL = dictURL[langCode] || dictURL.en
}
-
+ const dictInfo = dictsInfo[id]
return React.createElement(DictItem, {
t,
key: id,
@@ -256,8 +256,8 @@ export class DictPanel extends React.Component<DictPanelProps & { t: Translation
fontSize,
preferredHeight: allDictsConfig[id].preferredHeight,
panelWidth,
- searchStatus: (dictsInfo[id] as any).searchStatus,
- searchResult: (dictsInfo[id] as any).searchResult,
+ searchStatus: dictInfo ? dictInfo.searchStatus : SearchStatus.OnHold,
+ searchResult: dictInfo ? dictInfo.searchResult : null,
searchText: this.searchText,
updateItemHeight,
})
|
fix
|
dict info could be undefined
|
246c9afa324768502d39909e676e4dd140e8c1f5
|
2018-12-03 21:14:26
|
CRIMX
|
fix(dicts): add id when searching
| false
|
diff --git a/src/components/dictionaries/wikipedia/View.tsx b/src/components/dictionaries/wikipedia/View.tsx
index b6bb6da4b..4e745edb9 100644
--- a/src/components/dictionaries/wikipedia/View.tsx
+++ b/src/components/dictionaries/wikipedia/View.tsx
@@ -44,7 +44,7 @@ export default class DictBing extends React.PureComponent<ViewPorps<WikipediaRes
const payload: WikipediaPayload = {
url: e.target.value
}
- this.props.searchText({ payload })
+ this.props.searchText({ id: 'wikipedia', payload })
}
}
@@ -53,7 +53,7 @@ export default class DictBing extends React.PureComponent<ViewPorps<WikipediaRes
fetchLangs: true,
result: this.props.result
}
- this.props.searchText({ payload })
+ this.props.searchText({ id: 'wikipedia', payload })
}
renderLangSelector () {
|
fix
|
add id when searching
|
0f72cc183a0723cec52ed2fc2dd4530ab59a47c8
|
2019-07-05 20:22:02
|
CRIMX
|
build: update build system to neutrino and babel-ts
| false
|
diff --git a/.babelrc b/.babelrc
deleted file mode 100644
index c5e1e5fc7..000000000
--- a/.babelrc
+++ /dev/null
@@ -1,50 +0,0 @@
-{
- "env": {
- "test": {
- "presets": [
- ["env", {
- "modules": "commonjs",
- "targets": {
- "chrome": "55",
- "firefox": "56"
- }
- }],
- "react"
- ],
- "plugins": [
- ["transform-object-rest-spread", { "useBuiltIns": true }]
- ]
- },
- "development": {
- "presets": [
- ["env", {
- "modules": false,
- "targets": {
- "chrome": "55",
- "firefox": "56"
- }
- }],
- "react"
- ],
- "plugins": [
- ["transform-object-rest-spread", { "useBuiltIns": true }]
- ]
- },
- "production": {
- "presets": [
- ["env", {
- "modules": false,
- "targets": {
- "chrome": "55",
- "firefox": "56"
- }
- }],
- "react"
- ],
- "plugins": [
- "lodash",
- ["transform-object-rest-spread", { "useBuiltIns": true }]
- ]
- }
- }
-}
diff --git a/.browserslistrc b/.browserslistrc
new file mode 100644
index 000000000..bed09ba6c
--- /dev/null
+++ b/.browserslistrc
@@ -0,0 +1,2 @@
+Firefox > 66
+Chrome >= 63
diff --git a/.env b/.env
deleted file mode 100644
index 546cc03f6..000000000
--- a/.env
+++ /dev/null
@@ -1,2 +0,0 @@
-SDAPP_VETTED=
-SDAPP_ANALYTICS=
diff --git a/.eslintrc.js b/.eslintrc.js
new file mode 100644
index 000000000..c87103590
--- /dev/null
+++ b/.eslintrc.js
@@ -0,0 +1,35 @@
+module.exports = {
+ extends: [
+ 'standard',
+ 'plugin:prettier/recommended',
+ 'plugin:react/recommended'
+ ],
+ plugins: ['@typescript-eslint'],
+ parser: '@typescript-eslint/parser',
+ parserOptions: {
+ sourceType: 'module',
+ project: './tsconfig.json',
+ ecmaFeatures: {
+ jsx: true
+ }
+ },
+ rules: {
+ '@typescript-eslint/adjacent-overload-signatures': 'error',
+ 'prettier/prettier': [
+ 'error',
+ {
+ singleQuote: true,
+ semi: false
+ }
+ ],
+ yoda: 'off',
+ 'react/prop-types': 'off',
+ 'import/first': 'off',
+ 'no-unused-vars': 'off',
+ '@typescript-eslint/no-unused-vars': 'error',
+ 'no-dupe-class-members': 'off'
+ },
+ globals: {
+ browser: true
+ }
+}
diff --git a/.gitignore b/.gitignore
index 4ebbc0398..bab67cb43 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,23 +1,91 @@
-# See https://help.github.com/ignore-files/ for more about ignoring files.
+# Logs
+logs
+*.log
+npm-debug.log*
+yarn-debug.log*
+yarn-error.log*
+lerna-debug.log*
-# dependencies
-/node_modules
+# Diagnostic reports (https://nodejs.org/api/report.html)
+report.[0-9]*.[0-9]*.[0-9]*.[0-9]*.json
-# testing
-/coverage
+# Runtime data
+pids
+*.pid
+*.seed
+*.pid.lock
-# production
-/dist
+# Directory for instrumented libs generated by jscoverage/JSCover
+lib-cov
-# misc
-.DS_Store
-.env.local
-.env.development.local
-.env.test.local
-.env.production.local
+# Coverage directory used by tools like istanbul
+coverage
+*.lcov
-npm-debug.log*
-yarn-debug.log*
-yarn-error.log*
+# nyc test coverage
+.nyc_output
+
+# Grunt intermediate storage (https://gruntjs.com/creating-plugins#storing-task-files)
+.grunt
+
+# Bower dependency directory (https://bower.io/)
+bower_components
+
+# node-waf configuration
+.lock-wscript
+
+# Compiled binary addons (https://nodejs.org/api/addons.html)
+build/Release
+
+# Dependency directories
+node_modules/
+jspm_packages/
+
+# TypeScript v1 declaration files
+typings/
+
+# TypeScript cache
+*.tsbuildinfo
+
+# Optional npm cache directory
+.npm
+
+# Optional eslint cache
+.eslintcache
+
+# Optional REPL history
+.node_repl_history
+
+# Output of 'npm pack'
+*.tgz
+
+# Yarn Integrity file
+.yarn-integrity
+
+# dotenv environment variables file
+.env
+.env.test
+
+# parcel-bundler cache (https://parceljs.org/)
+.cache
+
+# next.js build output
+.next
+
+# nuxt.js build output
+.nuxt
+
+# vuepress build output
+.vuepress/dist
+
+# Serverless directories
+.serverless/
+
+# FuseBox cache
+.fusebox/
+
+# DynamoDB Local files
+.dynamodb/
-.vscode
+# Neutrino build directory
+build
diff --git a/.neutrinorc.js b/.neutrinorc.js
new file mode 100644
index 000000000..63aede73d
--- /dev/null
+++ b/.neutrinorc.js
@@ -0,0 +1,104 @@
+const path = require('path')
+const react = require('@neutrinojs/react')
+const copy = require('@neutrinojs/copy')
+const wext = require('neutrino-webextension')
+
+module.exports = {
+ optons: {
+ mains: {
+ content: {
+ entry: 'content',
+ webext: {
+ type: 'content_scripts',
+ manifest: {
+ matches: ['<all_urls>']
+ }
+ }
+ },
+
+ selection: {
+ entry: 'selection',
+ webext: {
+ type: 'content_scripts',
+ manifest: {
+ match_about_blank: true,
+ all_frames: true,
+ matches: ['<all_urls>']
+ }
+ }
+ },
+
+ popup: {
+ entry: 'popup',
+ webext: {
+ type: 'browser_action',
+ manifest: {
+ default_icon: {
+ '19': 'assets/icon-19.png',
+ '38': 'assets/icon-38.png'
+ }
+ }
+ }
+ },
+
+ options: {
+ entry: 'options',
+ webext: {
+ type: 'options_ui',
+ manifest: {
+ open_in_tab: true
+ }
+ }
+ },
+
+ background: {
+ entry: 'background',
+ webext: {
+ type: 'background'
+ }
+ }
+ }
+ },
+ use: [
+ react({
+ babel: {
+ presets: [
+ [
+ '@babel/preset-env',
+ {
+ /* remove targets set by neutrino web preset preferring browserslistrc */
+ }
+ ],
+ [
+ '@babel/preset-typescript',
+ {
+ isTSX: true,
+ allExtensions: true
+ }
+ ]
+ ]
+ }
+ }),
+ copy({
+ patterns: [
+ { context: 'assets', from: '**/*', to: 'assets', toType: 'dir' }
+ ]
+ }),
+ neutrino => {
+ /* eslint-disable indent */
+ // prettier-ignore
+ neutrino.config
+ .resolve
+ .extensions
+ .add('.ts')
+ .add('.tsx')
+ .end()
+ .alias
+ .set('@', path.join(__dirname, 'src'))
+ /* eslint-enable indent */
+ },
+ wext({
+ polyfill: true
+ })
+ ]
+}
diff --git a/.prettierrc b/.prettierrc
new file mode 100644
index 000000000..9c807385e
--- /dev/null
+++ b/.prettierrc
@@ -0,0 +1,3 @@
+tabWidth: 2
+semi: false
+singleQuote: true
diff --git a/.travis.yml b/.travis.yml
index 42b8205fc..3f6c608b3 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,8 +1,8 @@
language: node_js
node_js:
- - "9"
+ - "12"
before_install:
- - curl -o- -L https://yarnpkg.com/install.sh | bash -s -- --version 1.7.0
+ - curl -o- -L https://yarnpkg.com/install.sh | bash -s -- --version 1.16.0
- export PATH=$HOME/.yarn/bin:$PATH
cache:
yarn: true
@@ -11,6 +11,3 @@ cache:
script:
- yarn test
- yarn build
-# before_install: yarn global add greenkeeper-lockfile@1
-# before_script: greenkeeper-lockfile-update
-# after_script: greenkeeper-lockfile-upload
diff --git a/package.json b/package.json
index b4c039ae2..0a850def8 100644
--- a/package.json
+++ b/package.json
@@ -1,12 +1,13 @@
{
"name": "saladict",
- "version": "6.33.2",
+ "version": "7.0.0",
"description": "Chrome extension and Firefox WebExtension, inline translator powered by mutiple online dictionaries",
"private": true,
"scripts": {
- "start": "node scripts/start.js",
- "build": "node scripts/build.js",
+ "start": "webpack-dev-server --mode development --open",
+ "build": "webpack --mode production",
"devbuild": "node scripts/build.js --devbuild",
+ "type-check": "tsc --noEmit",
"zip": "node scripts/pack.js",
"test": "node scripts/test.js --env=jsdom",
"commit": "git-cz",
@@ -15,12 +16,12 @@
},
"husky": {
"hooks": {
- "commit-msg": "commitlint -e $GIT_PARAMS"
+ "commit-msg": "commitlint -E HUSKY_GIT_PARAMS"
}
},
"engines": {
- "node": ">= 8.9.4",
- "npm": ">= 5.6.0"
+ "node": ">= 12.5.0",
+ "npm": ">= 6.9.0"
},
"repository": {
"type": "git",
@@ -37,166 +38,40 @@
"path": "cz-conventional-changelog"
}
},
- "resolutions": {
- "@types/react": "*"
- },
"dependencies": {
- "@types/dompurify": "^0.0.31",
- "@types/i18next": "^8.4.3",
- "@types/lodash": "^4.14.98",
- "@types/memoize-one": "^4.1.1",
- "@types/node": "^9.3.0",
- "@types/pako": "^1.0.0",
- "@types/qrcode.react": "^0.8.1",
- "@types/react": "^16.3.14",
- "@types/react-dom": "^16.0.5",
- "@types/react-i18next": "^7.3.2",
- "@types/react-redux": "^5.0.16",
- "@types/react-transition-group": "^2.0.11",
- "@types/ua-parser-js": "^0.7.32",
- "@types/wavesurfer.js": "^2.0.2",
- "antd": "3.7.x",
- "dexie": "^2.0.3",
- "dompurify": "^1.0.4",
- "fbjs": "^0.8.16",
- "i18next": "^11.2.2",
- "lodash": "^4.17.4",
- "md5": "^2.2.1",
- "memoize-one": "^5.0.0",
- "normalize-scss": "^7.0.1",
- "pako": "^1.0.10",
- "qrcode.react": "^0.9.2",
- "react": "^16.4.0",
- "react-dom": "^16.4.0",
- "react-i18next": "^7.6.0",
- "react-number-editor": "^4.0.3",
- "react-redux": "^5.0.7",
- "react-sortable-hoc": "^1.4.0",
- "react-transition-group": "^2.3.1",
- "redux": "^3.7.2",
- "redux-thunk": "^2.2.0",
- "rxjs": "5.x",
- "soundtouchjs": "^0.1.5",
- "ua-parser-js": "^0.7.19",
- "wavesurfer.js": "^2.2.1",
- "web-ext-types": "crimx/web-ext-types"
+ "react": "^16",
+ "react-dom": "^16",
+ "react-hot-loader": "^4",
+ "web-ext-types": "latest",
+ "webextension-polyfill": "latest"
},
"devDependencies": {
- "@commitlint/cli": "^6.0.2",
- "@commitlint/config-conventional": "^6.0.2",
- "@types/enzyme": "^3.1.9",
- "@types/jest": "^22.0.1",
- "@types/sinon-chrome": "^2.2.0",
- "archiver": "^2.1.1",
- "autoprefixer": "8.1.0",
- "babel-core": "6.26.0",
- "babel-jest": "22.4.1",
- "babel-loader": "7.1.4",
- "babel-plugin-lodash": "^3.3.2",
- "babel-plugin-transform-object-rest-spread": "^6.26.0",
- "babel-preset-env": "^1.6.1",
- "babel-preset-react": "^6.24.1",
- "babel-runtime": "6.26.0",
- "case-sensitive-paths-webpack-plugin": "2.1.2",
- "chalk": "2.3.2",
- "commitizen": "^2.9.6",
- "copy-webpack-plugin": "^4.3.1",
- "css-loader": "0.28.10",
+ "@babel/preset-typescript": "^7.3.3",
+ "@commitlint/cli": "^8.0.0",
+ "@commitlint/config-conventional": "^8.0.0",
+ "@neutrinojs/copy": "^8.3.0",
+ "@neutrinojs/react": "^9.0.0-rc.3",
+ "@typescript-eslint/eslint-plugin": "^1.11.0",
+ "commitizen": "^3.1.1",
"cz-conventional-changelog": "^2.1.0",
- "dotenv": "5.0.1",
- "enzyme": "^3.3.0",
- "enzyme-adapter-react-16": "^1.1.1",
- "enzyme-to-json": "^3.3.3",
- "extract-text-webpack-plugin": "3.0.2",
- "file-loader": "1.1.11",
- "fork-ts-checker-webpack-plugin": "^0.4.0",
- "form-data": "^2.3.3",
- "fs-extra": "^5.0.0",
- "generate-json-webpack-plugin": "^0.2.2",
- "html-webpack-plugin": "3.0.6",
- "husky": "^1.2.1",
- "jest": "^22.0.6",
- "jest-fetch-mock": "^1.4.0",
- "jsconfig-paths-webpack-plugin": "^0.1.3",
- "minimist": "^1.2.0",
- "node-fetch": "^2.3.0",
- "node-sass": "^4.7.2",
- "postcss-flexbugs-fixes": "3.3.0",
- "postcss-increase-specificity": "^0.6.0",
- "postcss-loader": "2.1.1",
- "postcss-safe-important": "^1.1.0",
- "raf": "3.4.0",
- "raw-loader": "^0.5.1",
- "react-dev-utils": "^5.0.0",
- "rxjs-tslint-rules": "^4.0.0",
- "sass-loader": "^6.0.6",
- "semver": "^5.4.1",
- "sinon-chrome": "^2.2.4",
- "standard-version": "^4.3.0",
- "style-loader": "0.20.3",
- "ts-import-plugin": "^1.5.0",
- "ts-jest": "^22.4.3",
- "ts-lint": "^4.5.1",
- "ts-loader": "^3.2.0",
- "tsconfig-paths-webpack-plugin": "^3.0.3",
- "tslint": "^5.9.1",
- "tslint-config-standard": "^7.0.0",
- "typescript": "^2.8.1",
- "uglifyjs-webpack-plugin": "^1.2.5",
- "url-loader": "1.0.1",
- "vue-loader": "^14.0.0",
- "vue-style-loader": "^4.0.0",
- "vue-template-compiler": "^2.5.13",
- "webpack": "3.11.0",
- "webpack-bundle-analyzer": "^2.11.1",
- "webpack-dev-server": "2.11.1",
- "wrapper-webpack-plugin": "^1.0.0"
- },
- "jest": {
- "globals": {
- "ts-jest": {
- "useBabelrc": true
- }
- },
- "collectCoverageFrom": [
- "<rootDir>/src/content/**/*.{ts,tsx}",
- "<rootDir>/src/background/**/*.{ts,tsx}",
- "<rootDir>/src/selection/**/*.{ts,tsx}",
- "<rootDir>/src/components/**/*.{ts,tsx}",
- "<rootDir>/src/_helpers/**/*.{ts,tsx}"
- ],
- "setupFiles": [
- "<rootDir>/config/polyfills.js"
- ],
- "setupTestFrameworkScriptFile": "<rootDir>/config/jest/setupTests.js",
- "snapshotSerializers": [
- "enzyme-to-json/serializer"
- ],
- "testMatch": [
- "<rootDir>/test/specs/**/*.spec.{ts,tsx,js,jsx}"
- ],
- "testEnvironment": "node",
- "testURL": "http://localhost",
- "transform": {
- "^.+\\.jsx?$": "<rootDir>/node_modules/babel-jest",
- "^.+\\.tsx?$": "<rootDir>/node_modules/ts-jest",
- "^.+\\.css$": "<rootDir>/config/jest/cssTransform.js",
- "^(?!.*\\.(ts|tsx|js|jsx|css|json)$)": "<rootDir>/config/jest/fileTransform.js"
- },
- "transformIgnorePatterns": [
- "[/\\\\]node_modules[/\\\\].+\\.js$"
- ],
- "moduleNameMapper": {
- "^react-native$": "react-native-web",
- "^@/(.*)$": "<rootDir>/src/$1"
- },
- "moduleFileExtensions": [
- "ts",
- "tsx",
- "js",
- "json",
- "jsx",
- "node"
- ]
+ "eslint": "^6.0.1",
+ "eslint-config-prettier": "^6.0.0",
+ "eslint-config-standard": "^12.0.0",
+ "eslint-plugin-import": "^2.18.0",
+ "eslint-plugin-node": "^9.1.0",
+ "eslint-plugin-prettier": "^3.1.0",
+ "eslint-plugin-promise": "^4.2.1",
+ "eslint-plugin-react": "^7.14.2",
+ "eslint-plugin-standard": "^4.0.0",
+ "husky": "^3.0.0",
+ "jest": "^24.8.0",
+ "neutrino": "^9.0.0-rc.3",
+ "neutrino-webextension": "^0.1.1",
+ "prettier": "^1.18.2",
+ "standard-version": "^6.0.1",
+ "typescript": "^3.5.2",
+ "webpack": "^4",
+ "webpack-cli": "^3",
+ "webpack-dev-server": "^3"
}
}
diff --git a/src/manifest/chrome.manifest.json b/src/manifest/chrome.manifest.json
index 2d8fc0d79..5af2dc0ad 100644
--- a/src/manifest/chrome.manifest.json
+++ b/src/manifest/chrome.manifest.json
@@ -1,14 +1,12 @@
{
"background": {
- "scripts": [
- "static/browser-polyfill.min.js",
- "background.js"
- ],
"persistent": true
},
+ "options_ui": {
+ "chrome_style": false
+ },
"incognito": "split",
"homepage_url": "https://chrome.google.com/webstore/detail/cdonnmffkdaoajfknoeeecmchibpmkmg?hl=en",
- "options_page": "options.html",
"update_url": "https://clients2.google.com/service/update2/crx",
"minimum_chrome_version": "55"
}
diff --git a/src/manifest/common.manifest.json b/src/manifest/common.manifest.json
index d10920e86..751ec0350 100644
--- a/src/manifest/common.manifest.json
+++ b/src/manifest/common.manifest.json
@@ -17,27 +17,6 @@
"128": "static/icon-128.png"
},
- "content_scripts": [
- {
- "js": ["static/browser-polyfill.min.js"],
- "matches": ["<all_urls>"],
- "run_at": "document_start",
- "match_about_blank": true,
- "all_frames": true
- },
- {
- "js": ["content.js"],
- "css": ["content.css"],
- "matches": ["<all_urls>"]
- },
- {
- "js": ["selection.js"],
- "matches": ["<all_urls>"],
- "match_about_blank": true,
- "all_frames": true
- }
- ],
-
"commands": {
"toggle-active": {
"description": "__MSG_command_toggle_active__"
@@ -60,36 +39,9 @@
},
"web_accessible_resources": [
- "audio-control.html",
- "audio-control.js",
- "audio-control.css",
- "panel.html",
- "panel.js",
- "panel.css",
- "wordeditor.html",
- "wordeditor.js",
- "wordeditor.css",
- "options.html",
- "options.js",
- "options.css",
- "notebook.html",
- "notebook.js",
- "notebook.css",
- "history.html",
- "history.js",
- "history.css",
- "static/*",
- "dicts/*"
+ "assets/*"
],
- "browser_action": {
- "default_icon": {
- "19": "static/icon-19.png",
- "38": "static/icon-38.png"
- },
- "default_popup": "popup.html"
- },
-
"permissions": [
"<all_urls>",
"alarms",
diff --git a/src/manifest/firefox.manifest.json b/src/manifest/firefox.manifest.json
index 2f1c505a7..cadaa434c 100644
--- a/src/manifest/firefox.manifest.json
+++ b/src/manifest/firefox.manifest.json
@@ -1,14 +1,6 @@
{
- "background": {
- "scripts": [
- "static/browser-polyfill.min.js",
- "background.js"
- ]
- },
"options_ui": {
- "page": "options.html",
- "browser_style": false,
- "open_in_tab": true
+ "browser_style": false
},
"applications": {
"gecko": {
diff --git a/tsconfig.json b/tsconfig.json
index 2eaf7b503..f67711eb5 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -1,22 +1,26 @@
{
"compilerOptions": {
- "allowSyntheticDefaultImports": true,
- "baseUrl": "./",
- "jsx": "react",
- "lib": ["es2017", "dom", "dom.iterable"],
- "module": "es2015",
+ // Target latest version of ECMAScript.
+ "target": "esnext",
+ // Search under node_modules for non-relative imports.
"moduleResolution": "node",
- "noImplicitAny": false,
- "outDir": "./dist/",
- "paths": {
- "@/*": ["src/*"]
- },
- "sourceMap": true,
+ // Process & infer types from .js files.
+ "allowJs": true,
+ // Don't emit; allow Babel to transform files.
+ "noEmit": true,
+ // Enable strictest settings like strictNullChecks & noImplicitAny.
"strict": true,
- "target": "es2017",
- "typeRoots": ["node_modules/@types", "node_modules/web-ext-types", "src/typings"]
+ // Disallow features that require cross-file information for emit.
+ "isolatedModules": true,
+ // Import non-ES modules as default imports.
+ "esModuleInterop": true,
+ "typeRoots": [
+ "node_modules/@types",
+ "node_modules/web-ext-types",
+ "src/typings"
+ ],
},
"include": [
- "./src/**/*"
+ "src"
]
}
diff --git a/tslint.json b/tslint.json
deleted file mode 100644
index 688a0d385..000000000
--- a/tslint.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
- "extends": ["tslint-config-standard", "rxjs-tslint-rules"],
- "rules": {
- "trailing-comma": false,
- "return-undefined": false,
- "strict-type-predicates": false,
- "no-floating-promises": false,
- "no-unnecessary-type-assertion": false,
- "no-var-keyword": false,
-
- "rxjs-ban-observables": { "severity": "error" },
- "rxjs-ban-operators": { "severity": "error" },
- "rxjs-no-internal": { "severity": "error" }
- },
- "defaultSeverity": "warning"
-}
diff --git a/webpack.config.js b/webpack.config.js
new file mode 100644
index 000000000..cfe6e1487
--- /dev/null
+++ b/webpack.config.js
@@ -0,0 +1 @@
+module.exports = require('neutrino')().webpack()
diff --git a/yarn.lock b/yarn.lock
index 351a67f05..ed68e600c 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2,1384 +2,1902 @@
# yarn lockfile v1
-"@babel/code-frame@^7.0.0-beta.35":
- version "7.0.0-beta.49"
- resolved "http://registry.npm.taobao.org/@babel/code-frame/download/@babel/code-frame-7.0.0-beta.49.tgz#becd805482734440c9d137e46d77340e64d7f51b"
+"@babel/code-frame@^7.0.0":
+ version "7.0.0"
+ resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.0.0.tgz#06e2ab19bdb535385559aabb5ba59729482800f8"
+ integrity sha512-OfC2uemaknXr87bdLUkWog7nYuliM9Ij5HUcajsVcMCpQrcLmtxRbVFTIqmcSkSeYRBFBRxs2FiUqFJDLdiebA==
+ dependencies:
+ "@babel/highlight" "^7.0.0"
+
+"@babel/core@^7.1.0", "@babel/core@^7.4.3":
+ version "7.5.0"
+ resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.5.0.tgz#6ed6a2881ad48a732c5433096d96d1b0ee5eb734"
+ integrity sha512-6Isr4X98pwXqHvtigw71CKgmhL1etZjPs5A67jL/w0TkLM9eqmFR40YrnJvEc1WnMZFsskjsmid8bHZyxKEAnw==
+ dependencies:
+ "@babel/code-frame" "^7.0.0"
+ "@babel/generator" "^7.5.0"
+ "@babel/helpers" "^7.5.0"
+ "@babel/parser" "^7.5.0"
+ "@babel/template" "^7.4.4"
+ "@babel/traverse" "^7.5.0"
+ "@babel/types" "^7.5.0"
+ convert-source-map "^1.1.0"
+ debug "^4.1.0"
+ json5 "^2.1.0"
+ lodash "^4.17.11"
+ resolve "^1.3.2"
+ semver "^5.4.1"
+ source-map "^0.5.0"
+
+"@babel/generator@^7.4.0", "@babel/generator@^7.5.0":
+ version "7.5.0"
+ resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.5.0.tgz#f20e4b7a91750ee8b63656073d843d2a736dca4a"
+ integrity sha512-1TTVrt7J9rcG5PMjvO7VEG3FrEoEJNHxumRq66GemPmzboLWtIjjcJgk8rokuAS7IiRSpgVSu5Vb9lc99iJkOA==
dependencies:
- "@babel/highlight" "7.0.0-beta.49"
+ "@babel/types" "^7.5.0"
+ jsesc "^2.5.1"
+ lodash "^4.17.11"
+ source-map "^0.5.0"
+ trim-right "^1.0.1"
-"@babel/[email protected]":
- version "7.0.0-beta.49"
- resolved "http://registry.npm.taobao.org/@babel/highlight/download/@babel/highlight-7.0.0-beta.49.tgz#96bdc6b43e13482012ba6691b1018492d39622cc"
+"@babel/helper-annotate-as-pure@^7.0.0":
+ version "7.0.0"
+ resolved "https://registry.yarnpkg.com/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.0.0.tgz#323d39dd0b50e10c7c06ca7d7638e6864d8c5c32"
+ integrity sha512-3UYcJUj9kvSLbLbUIfQTqzcy5VX7GRZ/CCDrnOaZorFFM01aXp1+GJwuFGV4NDDoAS+mOUyHcO6UD/RfqOks3Q==
dependencies:
- chalk "^2.0.0"
- esutils "^2.0.2"
- js-tokens "^3.0.0"
+ "@babel/types" "^7.0.0"
-"@babel/runtime@^7.2.0":
- version "7.2.0"
- resolved "http://registry.npm.taobao.org/@babel/runtime/download/@babel/runtime-7.2.0.tgz#b03e42eeddf5898e00646e4c840fa07ba8dcad7f"
- integrity sha1-sD5C7t31iY4AZG5MhA+ge6jcrX8=
+"@babel/helper-builder-binary-assignment-operator-visitor@^7.1.0":
+ version "7.1.0"
+ resolved "https://registry.yarnpkg.com/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.1.0.tgz#6b69628dfe4087798e0c4ed98e3d4a6b2fbd2f5f"
+ integrity sha512-qNSR4jrmJ8M1VMM9tibvyRAHXQs2PmaksQF7c1CGJNipfe3D8p+wgNwgso/P2A2r2mdgBWAXljNWR0QRZAMW8w==
dependencies:
- regenerator-runtime "^0.12.0"
+ "@babel/helper-explode-assignable-expression" "^7.1.0"
+ "@babel/types" "^7.0.0"
-"@commitlint/cli@^6.0.2":
- version "6.2.0"
- resolved "http://registry.npm.taobao.org/@commitlint/cli/download/@commitlint/cli-6.2.0.tgz#b2f8190eb08ccd78eea65114b864f3c65eca466a"
+"@babel/helper-builder-react-jsx@^7.3.0":
+ version "7.3.0"
+ resolved "https://registry.yarnpkg.com/@babel/helper-builder-react-jsx/-/helper-builder-react-jsx-7.3.0.tgz#a1ac95a5d2b3e88ae5e54846bf462eeb81b318a4"
+ integrity sha512-MjA9KgwCuPEkQd9ncSXvSyJ5y+j2sICHyrI0M3L+6fnS4wMSNDc1ARXsbTfbb2cXHn17VisSnU/sHFTCxVxSMw==
+ dependencies:
+ "@babel/types" "^7.3.0"
+ esutils "^2.0.0"
+
+"@babel/helper-call-delegate@^7.4.4":
+ version "7.4.4"
+ resolved "https://registry.yarnpkg.com/@babel/helper-call-delegate/-/helper-call-delegate-7.4.4.tgz#87c1f8ca19ad552a736a7a27b1c1fcf8b1ff1f43"
+ integrity sha512-l79boDFJ8S1c5hvQvG+rc+wHw6IuH7YldmRKsYtpbawsxURu/paVy57FZMomGK22/JckepaikOkY0MoAmdyOlQ==
+ dependencies:
+ "@babel/helper-hoist-variables" "^7.4.4"
+ "@babel/traverse" "^7.4.4"
+ "@babel/types" "^7.4.4"
+
+"@babel/helper-create-class-features-plugin@^7.5.0":
+ version "7.5.0"
+ resolved "https://registry.yarnpkg.com/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.5.0.tgz#02edb97f512d44ba23b3227f1bf2ed43454edac5"
+ integrity sha512-EAoMc3hE5vE5LNhMqDOwB1usHvmRjCDAnH8CD4PVkX9/Yr3W/tcz8xE8QvdZxfsFBDICwZnF2UTHIqslRpvxmA==
+ dependencies:
+ "@babel/helper-function-name" "^7.1.0"
+ "@babel/helper-member-expression-to-functions" "^7.0.0"
+ "@babel/helper-optimise-call-expression" "^7.0.0"
+ "@babel/helper-plugin-utils" "^7.0.0"
+ "@babel/helper-replace-supers" "^7.4.4"
+ "@babel/helper-split-export-declaration" "^7.4.4"
+
+"@babel/helper-define-map@^7.4.4":
+ version "7.4.4"
+ resolved "https://registry.yarnpkg.com/@babel/helper-define-map/-/helper-define-map-7.4.4.tgz#6969d1f570b46bdc900d1eba8e5d59c48ba2c12a"
+ integrity sha512-IX3Ln8gLhZpSuqHJSnTNBWGDE9kdkTEWl21A/K7PQ00tseBwbqCHTvNLHSBd9M0R5rER4h5Rsvj9vw0R5SieBg==
+ dependencies:
+ "@babel/helper-function-name" "^7.1.0"
+ "@babel/types" "^7.4.4"
+ lodash "^4.17.11"
+
+"@babel/helper-explode-assignable-expression@^7.1.0":
+ version "7.1.0"
+ resolved "https://registry.yarnpkg.com/@babel/helper-explode-assignable-expression/-/helper-explode-assignable-expression-7.1.0.tgz#537fa13f6f1674df745b0c00ec8fe4e99681c8f6"
+ integrity sha512-NRQpfHrJ1msCHtKjbzs9YcMmJZOg6mQMmGRB+hbamEdG5PNpaSm95275VD92DvJKuyl0s2sFiDmMZ+EnnvufqA==
dependencies:
- "@commitlint/format" "^6.1.3"
- "@commitlint/lint" "^6.2.0"
- "@commitlint/load" "^6.1.3"
- "@commitlint/read" "^6.1.3"
- babel-polyfill "6.26.0"
- chalk "2.3.1"
- get-stdin "5.0.1"
- lodash.merge "4.6.1"
- lodash.pick "4.4.0"
- meow "4.0.0"
+ "@babel/traverse" "^7.1.0"
+ "@babel/types" "^7.0.0"
-"@commitlint/config-conventional@^6.0.2":
- version "6.1.3"
- resolved "http://registry.npm.taobao.org/@commitlint/config-conventional/download/@commitlint/config-conventional-6.1.3.tgz#6c06eeae04c5ac789c3618df4d52aeda89ffb810"
+"@babel/helper-function-name@^7.1.0":
+ version "7.1.0"
+ resolved "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.1.0.tgz#a0ceb01685f73355d4360c1247f582bfafc8ff53"
+ integrity sha512-A95XEoCpb3TO+KZzJ4S/5uW5fNe26DjBGqf1o9ucyLyCmi1dXq/B3c8iaWTfBk3VvetUxl16e8tIrd5teOCfGw==
+ dependencies:
+ "@babel/helper-get-function-arity" "^7.0.0"
+ "@babel/template" "^7.1.0"
+ "@babel/types" "^7.0.0"
-"@commitlint/ensure@^6.1.3":
- version "6.1.3"
- resolved "http://registry.npm.taobao.org/@commitlint/ensure/download/@commitlint/ensure-6.1.3.tgz#813b58c9fdfae15351b72fe646a162ebdb71ea2a"
+"@babel/helper-get-function-arity@^7.0.0":
+ version "7.0.0"
+ resolved "https://registry.yarnpkg.com/@babel/helper-get-function-arity/-/helper-get-function-arity-7.0.0.tgz#83572d4320e2a4657263734113c42868b64e49c3"
+ integrity sha512-r2DbJeg4svYvt3HOS74U4eWKsUAMRH01Z1ds1zx8KNTPtpTL5JAsdFv8BNyOpVqdFhHkkRDIg5B4AsxmkjAlmQ==
dependencies:
- lodash.camelcase "4.3.0"
- lodash.kebabcase "4.1.1"
- lodash.snakecase "4.1.1"
- lodash.startcase "4.4.0"
- lodash.upperfirst "4.3.1"
+ "@babel/types" "^7.0.0"
-"@commitlint/execute-rule@^6.1.3":
- version "6.1.3"
- resolved "http://registry.npm.taobao.org/@commitlint/execute-rule/download/@commitlint/execute-rule-6.1.3.tgz#48928e736ef15e8710d332a15c7c899555e4e10b"
+"@babel/helper-hoist-variables@^7.4.4":
+ version "7.4.4"
+ resolved "https://registry.yarnpkg.com/@babel/helper-hoist-variables/-/helper-hoist-variables-7.4.4.tgz#0298b5f25c8c09c53102d52ac4a98f773eb2850a"
+ integrity sha512-VYk2/H/BnYbZDDg39hr3t2kKyifAm1W6zHRfhx8jGjIHpQEBv9dry7oQ2f3+J703TLu69nYdxsovl0XYfcnK4w==
dependencies:
- babel-runtime "6.26.0"
+ "@babel/types" "^7.4.4"
-"@commitlint/format@^6.1.3":
- version "6.1.3"
- resolved "http://registry.npm.taobao.org/@commitlint/format/download/@commitlint/format-6.1.3.tgz#414b9048a9af54587da96222717ba332347abde3"
+"@babel/helper-member-expression-to-functions@^7.0.0":
+ version "7.0.0"
+ resolved "https://registry.yarnpkg.com/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.0.0.tgz#8cd14b0a0df7ff00f009e7d7a436945f47c7a16f"
+ integrity sha512-avo+lm/QmZlv27Zsi0xEor2fKcqWG56D5ae9dzklpIaY7cQMK5N8VSpaNVPPagiqmy7LrEjK1IWdGMOqPu5csg==
dependencies:
- babel-runtime "^6.23.0"
- chalk "^2.0.1"
+ "@babel/types" "^7.0.0"
-"@commitlint/is-ignored@^6.1.3":
- version "6.1.3"
- resolved "http://registry.npm.taobao.org/@commitlint/is-ignored/download/@commitlint/is-ignored-6.1.3.tgz#89c9b964a4d6228875a579c2bf552d003734b7e8"
+"@babel/helper-module-imports@^7.0.0":
+ version "7.0.0"
+ resolved "https://registry.yarnpkg.com/@babel/helper-module-imports/-/helper-module-imports-7.0.0.tgz#96081b7111e486da4d2cd971ad1a4fe216cc2e3d"
+ integrity sha512-aP/hlLq01DWNEiDg4Jn23i+CXxW/owM4WpDLFUbpjxe4NS3BhLVZQ5i7E0ZrxuQ/vwekIeciyamgB1UIYxxM6A==
dependencies:
- semver "5.5.0"
+ "@babel/types" "^7.0.0"
-"@commitlint/lint@^6.2.0":
- version "6.2.0"
- resolved "http://registry.npm.taobao.org/@commitlint/lint/download/@commitlint/lint-6.2.0.tgz#d78f219745b77362e1b814d5f4cec2ecc3266619"
+"@babel/helper-module-transforms@^7.1.0", "@babel/helper-module-transforms@^7.4.4":
+ version "7.4.4"
+ resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.4.4.tgz#96115ea42a2f139e619e98ed46df6019b94414b8"
+ integrity sha512-3Z1yp8TVQf+B4ynN7WoHPKS8EkdTbgAEy0nU0rs/1Kw4pDgmvYH3rz3aI11KgxKCba2cn7N+tqzV1mY2HMN96w==
dependencies:
- "@commitlint/is-ignored" "^6.1.3"
- "@commitlint/parse" "^6.1.3"
- "@commitlint/rules" "^6.2.0"
- babel-runtime "^6.23.0"
- lodash.topairs "4.3.0"
+ "@babel/helper-module-imports" "^7.0.0"
+ "@babel/helper-simple-access" "^7.1.0"
+ "@babel/helper-split-export-declaration" "^7.4.4"
+ "@babel/template" "^7.4.4"
+ "@babel/types" "^7.4.4"
+ lodash "^4.17.11"
-"@commitlint/load@^6.1.3":
- version "6.1.3"
- resolved "http://registry.npm.taobao.org/@commitlint/load/download/@commitlint/load-6.1.3.tgz#1be40711397958f316cf40577a9c879a16f00a54"
+"@babel/helper-optimise-call-expression@^7.0.0":
+ version "7.0.0"
+ resolved "https://registry.yarnpkg.com/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.0.0.tgz#a2920c5702b073c15de51106200aa8cad20497d5"
+ integrity sha512-u8nd9NQePYNQV8iPWu/pLLYBqZBa4ZaY1YWRFMuxrid94wKI1QNt67NEZ7GAe5Kc/0LLScbim05xZFWkAdrj9g==
dependencies:
- "@commitlint/execute-rule" "^6.1.3"
- "@commitlint/resolve-extends" "^6.1.3"
- babel-runtime "^6.23.0"
- cosmiconfig "^4.0.0"
- lodash.merge "4.6.1"
- lodash.mergewith "4.6.1"
- lodash.pick "4.4.0"
- lodash.topairs "4.3.0"
- resolve-from "4.0.0"
+ "@babel/types" "^7.0.0"
-"@commitlint/message@^6.1.3":
- version "6.1.3"
- resolved "http://registry.npm.taobao.org/@commitlint/message/download/@commitlint/message-6.1.3.tgz#5e0473330c887016010c4c56270723b8001145d2"
+"@babel/helper-plugin-utils@^7.0.0":
+ version "7.0.0"
+ resolved "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.0.0.tgz#bbb3fbee98661c569034237cc03967ba99b4f250"
+ integrity sha512-CYAOUCARwExnEixLdB6sDm2dIJ/YgEAKDM1MOeMeZu9Ld/bDgVo8aiWrXwcY7OBh+1Ea2uUcVRcxKk0GJvW7QA==
-"@commitlint/parse@^6.1.3":
- version "6.1.3"
- resolved "http://registry.npm.taobao.org/@commitlint/parse/download/@commitlint/parse-6.1.3.tgz#ff1e4d92c27cd676812bb6b9d76cd8853c0d9407"
+"@babel/helper-regex@^7.0.0", "@babel/helper-regex@^7.4.4":
+ version "7.4.4"
+ resolved "https://registry.yarnpkg.com/@babel/helper-regex/-/helper-regex-7.4.4.tgz#a47e02bc91fb259d2e6727c2a30013e3ac13c4a2"
+ integrity sha512-Y5nuB/kESmR3tKjU8Nkn1wMGEx1tjJX076HBMeL3XLQCu6vA/YRzuTW0bbb+qRnXvQGn+d6Rx953yffl8vEy7Q==
dependencies:
- conventional-changelog-angular "^1.3.3"
- conventional-commits-parser "^2.1.0"
+ lodash "^4.17.11"
-"@commitlint/read@^6.1.3":
- version "6.1.3"
- resolved "http://registry.npm.taobao.org/@commitlint/read/download/@commitlint/read-6.1.3.tgz#9f9d8db50fbf67f3000921657ed6efadb8cf9f1a"
+"@babel/helper-remap-async-to-generator@^7.1.0":
+ version "7.1.0"
+ resolved "https://registry.yarnpkg.com/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.1.0.tgz#361d80821b6f38da75bd3f0785ece20a88c5fe7f"
+ integrity sha512-3fOK0L+Fdlg8S5al8u/hWE6vhufGSn0bN09xm2LXMy//REAF8kDCrYoOBKYmA8m5Nom+sV9LyLCwrFynA8/slg==
+ dependencies:
+ "@babel/helper-annotate-as-pure" "^7.0.0"
+ "@babel/helper-wrap-function" "^7.1.0"
+ "@babel/template" "^7.1.0"
+ "@babel/traverse" "^7.1.0"
+ "@babel/types" "^7.0.0"
+
+"@babel/helper-replace-supers@^7.1.0", "@babel/helper-replace-supers@^7.4.4":
+ version "7.4.4"
+ resolved "https://registry.yarnpkg.com/@babel/helper-replace-supers/-/helper-replace-supers-7.4.4.tgz#aee41783ebe4f2d3ab3ae775e1cc6f1a90cefa27"
+ integrity sha512-04xGEnd+s01nY1l15EuMS1rfKktNF+1CkKmHoErDppjAAZL+IUBZpzT748x262HF7fibaQPhbvWUl5HeSt1EXg==
+ dependencies:
+ "@babel/helper-member-expression-to-functions" "^7.0.0"
+ "@babel/helper-optimise-call-expression" "^7.0.0"
+ "@babel/traverse" "^7.4.4"
+ "@babel/types" "^7.4.4"
+
+"@babel/helper-simple-access@^7.1.0":
+ version "7.1.0"
+ resolved "https://registry.yarnpkg.com/@babel/helper-simple-access/-/helper-simple-access-7.1.0.tgz#65eeb954c8c245beaa4e859da6188f39d71e585c"
+ integrity sha512-Vk+78hNjRbsiu49zAPALxTb+JUQCz1aolpd8osOF16BGnLtseD21nbHgLPGUwrXEurZgiCOUmvs3ExTu4F5x6w==
dependencies:
- "@commitlint/top-level" "^6.1.3"
- "@marionebl/sander" "^0.6.0"
- babel-runtime "^6.23.0"
- git-raw-commits "^1.3.0"
+ "@babel/template" "^7.1.0"
+ "@babel/types" "^7.0.0"
-"@commitlint/resolve-extends@^6.1.3":
- version "6.1.3"
- resolved "http://registry.npm.taobao.org/@commitlint/resolve-extends/download/@commitlint/resolve-extends-6.1.3.tgz#f45fcfe43860e05e38f3d94d54caed7ddaa41e25"
+"@babel/helper-split-export-declaration@^7.4.4":
+ version "7.4.4"
+ resolved "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.4.4.tgz#ff94894a340be78f53f06af038b205c49d993677"
+ integrity sha512-Ro/XkzLf3JFITkW6b+hNxzZ1n5OQ80NvIUdmHspih1XAhtN3vPTuUFT4eQnela+2MaZ5ulH+iyP513KJrxbN7Q==
dependencies:
- babel-runtime "6.26.0"
- lodash.merge "4.6.1"
- lodash.omit "4.5.0"
- require-uncached "^1.0.3"
- resolve-from "^4.0.0"
- resolve-global "^0.1.0"
+ "@babel/types" "^7.4.4"
-"@commitlint/rules@^6.2.0":
- version "6.2.0"
- resolved "http://registry.npm.taobao.org/@commitlint/rules/download/@commitlint/rules-6.2.0.tgz#9391f65a16552822048d45a33ab6ce374686e06b"
+"@babel/helper-wrap-function@^7.1.0":
+ version "7.2.0"
+ resolved "https://registry.yarnpkg.com/@babel/helper-wrap-function/-/helper-wrap-function-7.2.0.tgz#c4e0012445769e2815b55296ead43a958549f6fa"
+ integrity sha512-o9fP1BZLLSrYlxYEYyl2aS+Flun5gtjTIG8iln+XuEzQTs0PLagAGSXUcqruJwD5fM48jzIEggCKpIfWTcR7pQ==
dependencies:
- "@commitlint/ensure" "^6.1.3"
- "@commitlint/message" "^6.1.3"
- "@commitlint/to-lines" "^6.1.3"
- babel-runtime "^6.23.0"
-
-"@commitlint/to-lines@^6.1.3":
- version "6.1.3"
- resolved "http://registry.npm.taobao.org/@commitlint/to-lines/download/@commitlint/to-lines-6.1.3.tgz#7ab16a02caed8daa47e959269b96164610a29d0c"
+ "@babel/helper-function-name" "^7.1.0"
+ "@babel/template" "^7.1.0"
+ "@babel/traverse" "^7.1.0"
+ "@babel/types" "^7.2.0"
-"@commitlint/top-level@^6.1.3":
- version "6.1.3"
- resolved "http://registry.npm.taobao.org/@commitlint/top-level/download/@commitlint/top-level-6.1.3.tgz#126dcb6de1676342c69cd42261483f4478547299"
+"@babel/helpers@^7.5.0":
+ version "7.5.0"
+ resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.5.0.tgz#7f0c17666e7ed8355ed6eff643dde12fb681ddb4"
+ integrity sha512-EgCUEa8cNwuMrwo87l2d7i2oShi8m2Q58H7h3t4TWtqATZalJYFwfL9DulRe02f3KdqM9xmMCw3v/7Ll+EiaWg==
dependencies:
- find-up "^2.1.0"
+ "@babel/template" "^7.4.4"
+ "@babel/traverse" "^7.5.0"
+ "@babel/types" "^7.5.0"
-"@marionebl/sander@^0.6.0":
- version "0.6.1"
- resolved "http://registry.npm.taobao.org/@marionebl/sander/download/@marionebl/sander-0.6.1.tgz#1958965874f24bc51be48875feb50d642fc41f7b"
+"@babel/highlight@^7.0.0":
+ version "7.5.0"
+ resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.5.0.tgz#56d11312bd9248fa619591d02472be6e8cb32540"
+ integrity sha512-7dV4eu9gBxoM0dAnj/BCFDW9LFU0zvTrkq0ugM7pnHEgguOEeOz1so2ZghEdzviYzQEED0r4EAgpsBChKy1TRQ==
dependencies:
- graceful-fs "^4.1.3"
- mkdirp "^0.5.1"
- rimraf "^2.5.2"
+ chalk "^2.0.0"
+ esutils "^2.0.2"
+ js-tokens "^4.0.0"
-"@sinonjs/formatio@^2.0.0":
- version "2.0.0"
- resolved "http://registry.npm.taobao.org/@sinonjs/formatio/download/@sinonjs/formatio-2.0.0.tgz#84db7e9eb5531df18a8c5e0bfb6e449e55e654b2"
+"@babel/parser@^7.1.0", "@babel/parser@^7.4.3", "@babel/parser@^7.4.4", "@babel/parser@^7.5.0":
+ version "7.5.0"
+ resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.5.0.tgz#3e0713dff89ad6ae37faec3b29dcfc5c979770b7"
+ integrity sha512-I5nW8AhGpOXGCCNYGc+p7ExQIBxRFnS2fd/d862bNOKvmoEPjYPcfIjsfdy0ujagYOIYPczKgD9l3FsgTkAzKA==
+
+"@babel/plugin-proposal-async-generator-functions@^7.2.0":
+ version "7.2.0"
+ resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.2.0.tgz#b289b306669dce4ad20b0252889a15768c9d417e"
+ integrity sha512-+Dfo/SCQqrwx48ptLVGLdE39YtWRuKc/Y9I5Fy0P1DDBB9lsAHpjcEJQt+4IifuSOSTLBKJObJqMvaO1pIE8LQ==
dependencies:
- samsam "1.3.0"
+ "@babel/helper-plugin-utils" "^7.0.0"
+ "@babel/helper-remap-async-to-generator" "^7.1.0"
+ "@babel/plugin-syntax-async-generators" "^7.2.0"
-"@types/cheerio@*":
- version "0.22.7"
- resolved "http://registry.npm.taobao.org/@types/cheerio/download/@types/cheerio-0.22.7.tgz#4a92eafedfb2b9f4437d3a4410006d81114c66ce"
+"@babel/plugin-proposal-class-properties@^7.4.0":
+ version "7.5.0"
+ resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.5.0.tgz#5bc6a0537d286fcb4fd4e89975adbca334987007"
+ integrity sha512-9L/JfPCT+kShiiTTzcnBJ8cOwdKVmlC1RcCf9F0F9tERVrM4iWtWnXtjWCRqNm2la2BxO1MPArWNsU9zsSJWSQ==
+ dependencies:
+ "@babel/helper-create-class-features-plugin" "^7.5.0"
+ "@babel/helper-plugin-utils" "^7.0.0"
-"@types/chrome@*":
- version "0.0.66"
- resolved "http://registry.npm.taobao.org/@types/chrome/download/@types/chrome-0.0.66.tgz#8f8e573b9e47c7d9bf83566eea7b2158264f83d5"
+"@babel/plugin-proposal-dynamic-import@^7.5.0":
+ version "7.5.0"
+ resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-dynamic-import/-/plugin-proposal-dynamic-import-7.5.0.tgz#e532202db4838723691b10a67b8ce509e397c506"
+ integrity sha512-x/iMjggsKTFHYC6g11PL7Qy58IK8H5zqfm9e6hu4z1iH2IRyAp9u9dL80zA6R76yFovETFLKz2VJIC2iIPBuFw==
dependencies:
- "@types/filesystem" "*"
+ "@babel/helper-plugin-utils" "^7.0.0"
+ "@babel/plugin-syntax-dynamic-import" "^7.2.0"
-"@types/dompurify@^0.0.31":
- version "0.0.31"
- resolved "http://registry.npm.taobao.org/@types/dompurify/download/@types/dompurify-0.0.31.tgz#f152d5a81f2b5625e29f11eb016cd9b301d0d4b4"
+"@babel/plugin-proposal-json-strings@^7.2.0":
+ version "7.2.0"
+ resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-json-strings/-/plugin-proposal-json-strings-7.2.0.tgz#568ecc446c6148ae6b267f02551130891e29f317"
+ integrity sha512-MAFV1CA/YVmYwZG0fBQyXhmj0BHCB5egZHCKWIFVv/XCxAeVGIHfos3SwDck4LvCllENIAg7xMKOG5kH0dzyUg==
+ dependencies:
+ "@babel/helper-plugin-utils" "^7.0.0"
+ "@babel/plugin-syntax-json-strings" "^7.2.0"
-"@types/enzyme@^3.1.9":
- version "3.1.10"
- resolved "http://registry.npm.taobao.org/@types/enzyme/download/@types/enzyme-3.1.10.tgz#28108a9864e65699751469551a803a35d2e26160"
+"@babel/plugin-proposal-object-rest-spread@^7.5.0":
+ version "7.5.0"
+ resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.5.0.tgz#4838ce3cbc9a84dd00bce7a17e9e9c36119f83a0"
+ integrity sha512-G1qy5EdcO3vYhbxlXjRSR2SXB8GsxYv9hoRKT1Jdn3qy/NUnFqUUnqymKZ00Pbj+3FXNh06B+BUZzecrp3sxNw==
dependencies:
- "@types/cheerio" "*"
- "@types/react" "*"
+ "@babel/helper-plugin-utils" "^7.0.0"
+ "@babel/plugin-syntax-object-rest-spread" "^7.2.0"
-"@types/filesystem@*":
- version "0.0.28"
- resolved "http://registry.npm.taobao.org/@types/filesystem/download/@types/filesystem-0.0.28.tgz#3fd7735830f2c7413cb5ac45780bc45904697b0e"
+"@babel/plugin-proposal-optional-catch-binding@^7.2.0":
+ version "7.2.0"
+ resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-optional-catch-binding/-/plugin-proposal-optional-catch-binding-7.2.0.tgz#135d81edb68a081e55e56ec48541ece8065c38f5"
+ integrity sha512-mgYj3jCcxug6KUcX4OBoOJz3CMrwRfQELPQ5560F70YQUBZB7uac9fqaWamKR1iWUzGiK2t0ygzjTScZnVz75g==
dependencies:
- "@types/filewriter" "*"
+ "@babel/helper-plugin-utils" "^7.0.0"
+ "@babel/plugin-syntax-optional-catch-binding" "^7.2.0"
-"@types/filewriter@*":
- version "0.0.28"
- resolved "http://registry.npm.taobao.org/@types/filewriter/download/@types/filewriter-0.0.28.tgz#c054e8af4d9dd75db4e63abc76f885168714d4b3"
+"@babel/plugin-proposal-unicode-property-regex@^7.4.4":
+ version "7.4.4"
+ resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.4.4.tgz#501ffd9826c0b91da22690720722ac7cb1ca9c78"
+ integrity sha512-j1NwnOqMG9mFUOH58JTFsA/+ZYzQLUZ/drqWUqxCYLGeu2JFZL8YrNC9hBxKmWtAuOCHPcRpgv7fhap09Fb4kA==
+ dependencies:
+ "@babel/helper-plugin-utils" "^7.0.0"
+ "@babel/helper-regex" "^7.4.4"
+ regexpu-core "^4.5.4"
-"@types/i18next@*", "@types/i18next@^8.4.3":
- version "8.4.3"
- resolved "http://registry.npm.taobao.org/@types/i18next/download/@types/i18next-8.4.3.tgz#9136a9551bf5bf7169aa9f3125c1743f1f8dd6de"
+"@babel/plugin-syntax-async-generators@^7.2.0":
+ version "7.2.0"
+ resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-async-generators/-/plugin-syntax-async-generators-7.2.0.tgz#69e1f0db34c6f5a0cf7e2b3323bf159a76c8cb7f"
+ integrity sha512-1ZrIRBv2t0GSlcwVoQ6VgSLpLgiN/FVQUzt9znxo7v2Ov4jJrs8RY8tv0wvDmFN3qIdMKWrmMMW6yZ0G19MfGg==
+ dependencies:
+ "@babel/helper-plugin-utils" "^7.0.0"
-"@types/jest@^22.0.1":
- version "22.2.3"
- resolved "http://registry.npm.taobao.org/@types/jest/download/@types/jest-22.2.3.tgz#0157c0316dc3722c43a7b71de3fdf3acbccef10d"
+"@babel/plugin-syntax-dynamic-import@^7.2.0":
+ version "7.2.0"
+ resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-dynamic-import/-/plugin-syntax-dynamic-import-7.2.0.tgz#69c159ffaf4998122161ad8ebc5e6d1f55df8612"
+ integrity sha512-mVxuJ0YroI/h/tbFTPGZR8cv6ai+STMKNBq0f8hFxsxWjl94qqhsb+wXbpNMDPU3cfR1TIsVFzU3nXyZMqyK4w==
+ dependencies:
+ "@babel/helper-plugin-utils" "^7.0.0"
-"@types/lodash@^4.14.98":
- version "4.14.109"
- resolved "http://registry.npm.taobao.org/@types/lodash/download/@types/lodash-4.14.109.tgz#b1c4442239730bf35cabaf493c772b18c045886d"
+"@babel/plugin-syntax-json-strings@^7.2.0":
+ version "7.2.0"
+ resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-json-strings/-/plugin-syntax-json-strings-7.2.0.tgz#72bd13f6ffe1d25938129d2a186b11fd62951470"
+ integrity sha512-5UGYnMSLRE1dqqZwug+1LISpA403HzlSfsg6P9VXU6TBjcSHeNlw4DxDx7LgpF+iKZoOG/+uzqoRHTdcUpiZNg==
+ dependencies:
+ "@babel/helper-plugin-utils" "^7.0.0"
-"@types/memoize-one@^4.1.1":
- version "4.1.1"
- resolved "http://registry.npm.taobao.org/@types/memoize-one/download/@types/memoize-one-4.1.1.tgz#41dd138a4335b5041f7d8fc038f9d593d88b3369"
- integrity sha1-Qd0TikM1tQQffY/AOPnVk9iLM2k=
+"@babel/plugin-syntax-jsx@^7.2.0":
+ version "7.2.0"
+ resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.2.0.tgz#0b85a3b4bc7cdf4cc4b8bf236335b907ca22e7c7"
+ integrity sha512-VyN4QANJkRW6lDBmENzRszvZf3/4AXaj9YR7GwrWeeN9tEBPuXbmDYVU9bYBN0D70zCWVwUy0HWq2553VCb6Hw==
+ dependencies:
+ "@babel/helper-plugin-utils" "^7.0.0"
-"@types/node@*":
- version "10.1.3"
- resolved "http://registry.npm.taobao.org/@types/node/download/@types/node-10.1.3.tgz#5c16980936c4e3c83ce64e8ed71fb37bd7aea135"
+"@babel/plugin-syntax-object-rest-spread@^7.0.0", "@babel/plugin-syntax-object-rest-spread@^7.2.0":
+ version "7.2.0"
+ resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-object-rest-spread/-/plugin-syntax-object-rest-spread-7.2.0.tgz#3b7a3e733510c57e820b9142a6579ac8b0dfad2e"
+ integrity sha512-t0JKGgqk2We+9may3t0xDdmneaXmyxq0xieYcKHxIsrJO64n1OiMWNUtc5gQK1PA0NpdCRrtZp4z+IUaKugrSA==
+ dependencies:
+ "@babel/helper-plugin-utils" "^7.0.0"
-"@types/node@^9.3.0":
- version "9.6.18"
- resolved "http://registry.npm.taobao.org/@types/node/download/@types/node-9.6.18.tgz#092e13ef64c47e986802c9c45a61c1454813b31d"
+"@babel/plugin-syntax-optional-catch-binding@^7.2.0":
+ version "7.2.0"
+ resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-optional-catch-binding/-/plugin-syntax-optional-catch-binding-7.2.0.tgz#a94013d6eda8908dfe6a477e7f9eda85656ecf5c"
+ integrity sha512-bDe4xKNhb0LI7IvZHiA13kff0KEfaGX/Hv4lMA9+7TEc63hMNvfKo6ZFpXhKuEp+II/q35Gc4NoMeDZyaUbj9w==
+ dependencies:
+ "@babel/helper-plugin-utils" "^7.0.0"
-"@types/pako@^1.0.0":
- version "1.0.0"
- resolved "http://registry.npm.taobao.org/@types/pako/download/@types/pako-1.0.0.tgz#eaae8364d1b7f752e263bc3fd68dfec98e6136c5"
- integrity sha1-6q6DZNG391LiY7w/1o3+yY5hNsU=
+"@babel/plugin-syntax-typescript@^7.2.0":
+ version "7.3.3"
+ resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-typescript/-/plugin-syntax-typescript-7.3.3.tgz#a7cc3f66119a9f7ebe2de5383cce193473d65991"
+ integrity sha512-dGwbSMA1YhVS8+31CnPR7LB4pcbrzcV99wQzby4uAfrkZPYZlQ7ImwdpzLqi6Z6IL02b8IAL379CaMwo0x5Lag==
+ dependencies:
+ "@babel/helper-plugin-utils" "^7.0.0"
-"@types/qrcode.react@^0.8.1":
- version "0.8.1"
- resolved "https://registry.yarnpkg.com/@types/qrcode.react/-/qrcode.react-0.8.1.tgz#7efeb1d01d8e6dddcdf07fbec0724aaf0fa5c984"
- integrity sha512-OpMOBjWIMTnC1sdLcFgif/cXZYiPQGUN2yDaxC2EmZaAmElxehE+toMzPZvUJVXNyFXFdmYSDRWsjKtTTnqqAQ==
+"@babel/plugin-transform-arrow-functions@^7.2.0":
+ version "7.2.0"
+ resolved "https://registry.yarnpkg.com/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.2.0.tgz#9aeafbe4d6ffc6563bf8f8372091628f00779550"
+ integrity sha512-ER77Cax1+8/8jCB9fo4Ud161OZzWN5qawi4GusDuRLcDbDG+bIGYY20zb2dfAFdTRGzrfq2xZPvF0R64EHnimg==
dependencies:
- "@types/react" "*"
+ "@babel/helper-plugin-utils" "^7.0.0"
-"@types/react-dom@^16.0.5":
- version "16.0.5"
- resolved "http://registry.npm.taobao.org/@types/react-dom/download/@types/react-dom-16.0.5.tgz#a757457662e3819409229e8f86795ff37b371f96"
+"@babel/plugin-transform-async-to-generator@^7.5.0":
+ version "7.5.0"
+ resolved "https://registry.yarnpkg.com/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.5.0.tgz#89a3848a0166623b5bc481164b5936ab947e887e"
+ integrity sha512-mqvkzwIGkq0bEF1zLRRiTdjfomZJDV33AH3oQzHVGkI2VzEmXLpKKOBvEVaFZBJdN0XTyH38s9j/Kiqr68dggg==
dependencies:
- "@types/node" "*"
- "@types/react" "*"
+ "@babel/helper-module-imports" "^7.0.0"
+ "@babel/helper-plugin-utils" "^7.0.0"
+ "@babel/helper-remap-async-to-generator" "^7.1.0"
-"@types/react-i18next@^7.3.2":
- version "7.6.1"
- resolved "http://registry.npm.taobao.org/@types/react-i18next/download/@types/react-i18next-7.6.1.tgz#62162cc796a78db4c11b3d82d76d3a0d94a9b6eb"
+"@babel/plugin-transform-block-scoped-functions@^7.2.0":
+ version "7.2.0"
+ resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.2.0.tgz#5d3cc11e8d5ddd752aa64c9148d0db6cb79fd190"
+ integrity sha512-ntQPR6q1/NKuphly49+QiQiTN0O63uOwjdD6dhIjSWBI5xlrbUFh720TIpzBhpnrLfv2tNH/BXvLIab1+BAI0w==
+ dependencies:
+ "@babel/helper-plugin-utils" "^7.0.0"
+
+"@babel/plugin-transform-block-scoping@^7.4.4":
+ version "7.4.4"
+ resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.4.4.tgz#c13279fabf6b916661531841a23c4b7dae29646d"
+ integrity sha512-jkTUyWZcTrwxu5DD4rWz6rDB5Cjdmgz6z7M7RLXOJyCUkFBawssDGcGh8M/0FTSB87avyJI1HsTwUXp9nKA1PA==
+ dependencies:
+ "@babel/helper-plugin-utils" "^7.0.0"
+ lodash "^4.17.11"
+
+"@babel/plugin-transform-classes@^7.4.4":
+ version "7.4.4"
+ resolved "https://registry.yarnpkg.com/@babel/plugin-transform-classes/-/plugin-transform-classes-7.4.4.tgz#0ce4094cdafd709721076d3b9c38ad31ca715eb6"
+ integrity sha512-/e44eFLImEGIpL9qPxSRat13I5QNRgBLu2hOQJCF7VLy/otSM/sypV1+XaIw5+502RX/+6YaSAPmldk+nhHDPw==
+ dependencies:
+ "@babel/helper-annotate-as-pure" "^7.0.0"
+ "@babel/helper-define-map" "^7.4.4"
+ "@babel/helper-function-name" "^7.1.0"
+ "@babel/helper-optimise-call-expression" "^7.0.0"
+ "@babel/helper-plugin-utils" "^7.0.0"
+ "@babel/helper-replace-supers" "^7.4.4"
+ "@babel/helper-split-export-declaration" "^7.4.4"
+ globals "^11.1.0"
+
+"@babel/plugin-transform-computed-properties@^7.2.0":
+ version "7.2.0"
+ resolved "https://registry.yarnpkg.com/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.2.0.tgz#83a7df6a658865b1c8f641d510c6f3af220216da"
+ integrity sha512-kP/drqTxY6Xt3NNpKiMomfgkNn4o7+vKxK2DDKcBG9sHj51vHqMBGy8wbDS/J4lMxnqs153/T3+DmCEAkC5cpA==
dependencies:
- "@types/i18next" "*"
- "@types/react" "*"
+ "@babel/helper-plugin-utils" "^7.0.0"
-"@types/react-redux@^5.0.16":
- version "5.0.20"
- resolved "http://registry.npm.taobao.org/@types/react-redux/download/@types/react-redux-5.0.20.tgz#a332f2a97043d6127159956a4639a9fb5dc1f5dc"
+"@babel/plugin-transform-destructuring@^7.5.0":
+ version "7.5.0"
+ resolved "https://registry.yarnpkg.com/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.5.0.tgz#f6c09fdfe3f94516ff074fe877db7bc9ef05855a"
+ integrity sha512-YbYgbd3TryYYLGyC7ZR+Tq8H/+bCmwoaxHfJHupom5ECstzbRLTch6gOQbhEY9Z4hiCNHEURgq06ykFv9JZ/QQ==
dependencies:
- "@types/react" "*"
- redux "^3.6.0"
+ "@babel/helper-plugin-utils" "^7.0.0"
-"@types/react-transition-group@^2.0.11":
- version "2.0.11"
- resolved "http://registry.npm.taobao.org/@types/react-transition-group/download/@types/react-transition-group-2.0.11.tgz#feb274676a39383fffaa0dff710958d2251abefb"
+"@babel/plugin-transform-dotall-regex@^7.4.4":
+ version "7.4.4"
+ resolved "https://registry.yarnpkg.com/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.4.4.tgz#361a148bc951444312c69446d76ed1ea8e4450c3"
+ integrity sha512-P05YEhRc2h53lZDjRPk/OektxCVevFzZs2Gfjd545Wde3k+yFDbXORgl2e0xpbq8mLcKJ7Idss4fAg0zORN/zg==
dependencies:
- "@types/react" "*"
+ "@babel/helper-plugin-utils" "^7.0.0"
+ "@babel/helper-regex" "^7.4.4"
+ regexpu-core "^4.5.4"
-"@types/react@*", "@types/react@^16.3.14":
- version "16.3.14"
- resolved "http://registry.npm.taobao.org/@types/react/download/@types/react-16.3.14.tgz#f90ac6834de172e13ecca430dcb6814744225d36"
+"@babel/plugin-transform-duplicate-keys@^7.5.0":
+ version "7.5.0"
+ resolved "https://registry.yarnpkg.com/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.5.0.tgz#c5dbf5106bf84cdf691222c0974c12b1df931853"
+ integrity sha512-igcziksHizyQPlX9gfSjHkE2wmoCH3evvD2qR5w29/Dk0SMKE/eOI7f1HhBdNhR/zxJDqrgpoDTq5YSLH/XMsQ==
dependencies:
- csstype "^2.2.0"
+ "@babel/helper-plugin-utils" "^7.0.0"
-"@types/sinon-chrome@^2.2.0":
- version "2.2.4"
- resolved "http://registry.npm.taobao.org/@types/sinon-chrome/download/@types/sinon-chrome-2.2.4.tgz#6cdae18b6c99d770faa41d34e82f641dfb54eae0"
+"@babel/plugin-transform-exponentiation-operator@^7.2.0":
+ version "7.2.0"
+ resolved "https://registry.yarnpkg.com/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.2.0.tgz#a63868289e5b4007f7054d46491af51435766008"
+ integrity sha512-umh4hR6N7mu4Elq9GG8TOu9M0bakvlsREEC+ialrQN6ABS4oDQ69qJv1VtR3uxlKMCQMCvzk7vr17RHKcjx68A==
dependencies:
- "@types/chrome" "*"
- "@types/sinon" "*"
+ "@babel/helper-builder-binary-assignment-operator-visitor" "^7.1.0"
+ "@babel/helper-plugin-utils" "^7.0.0"
-"@types/sinon@*":
- version "5.0.0"
- resolved "http://registry.npm.taobao.org/@types/sinon/download/@types/sinon-5.0.0.tgz#e5d49a422f64b2c658bbeb8529679c9a6a0b5a3a"
+"@babel/plugin-transform-for-of@^7.4.4":
+ version "7.4.4"
+ resolved "https://registry.yarnpkg.com/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.4.4.tgz#0267fc735e24c808ba173866c6c4d1440fc3c556"
+ integrity sha512-9T/5Dlr14Z9TIEXLXkt8T1DU7F24cbhwhMNUziN3hB1AXoZcdzPcTiKGRn/6iOymDqtTKWnr/BtRKN9JwbKtdQ==
+ dependencies:
+ "@babel/helper-plugin-utils" "^7.0.0"
-"@types/ua-parser-js@^0.7.32":
- version "0.7.32"
- resolved "http://registry.npm.taobao.org/@types/ua-parser-js/download/@types/ua-parser-js-0.7.32.tgz#8827d451d6702307248073b5d98aa9293d02b5e5"
- integrity sha1-iCfUUdZwIwckgHO12YqpKT0CteU=
+"@babel/plugin-transform-function-name@^7.4.4":
+ version "7.4.4"
+ resolved "https://registry.yarnpkg.com/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.4.4.tgz#e1436116abb0610c2259094848754ac5230922ad"
+ integrity sha512-iU9pv7U+2jC9ANQkKeNF6DrPy4GBa4NWQtl6dHB4Pb3izX2JOEvDTFarlNsBj/63ZEzNNIAMs3Qw4fNCcSOXJA==
+ dependencies:
+ "@babel/helper-function-name" "^7.1.0"
+ "@babel/helper-plugin-utils" "^7.0.0"
-"@types/wavesurfer.js@^2.0.2":
- version "2.0.2"
- resolved "https://registry.npm.taobao.org/@types/wavesurfer.js/download/@types/wavesurfer.js-2.0.2.tgz#b98a4d57ca24ee2028ae6dd5c2208b568bb73842"
- integrity sha1-uYpNV8ok7iAorm3VwiCLVou3OEI=
+"@babel/plugin-transform-literals@^7.2.0":
+ version "7.2.0"
+ resolved "https://registry.yarnpkg.com/@babel/plugin-transform-literals/-/plugin-transform-literals-7.2.0.tgz#690353e81f9267dad4fd8cfd77eafa86aba53ea1"
+ integrity sha512-2ThDhm4lI4oV7fVQ6pNNK+sx+c/GM5/SaML0w/r4ZB7sAneD/piDJtwdKlNckXeyGK7wlwg2E2w33C/Hh+VFCg==
+ dependencies:
+ "@babel/helper-plugin-utils" "^7.0.0"
-JSONStream@^1.0.4:
- version "1.3.3"
- resolved "http://registry.npm.taobao.org/JSONStream/download/JSONStream-1.3.3.tgz#27b4b8fbbfeab4e71bcf551e7f27be8d952239bf"
+"@babel/plugin-transform-member-expression-literals@^7.2.0":
+ version "7.2.0"
+ resolved "https://registry.yarnpkg.com/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.2.0.tgz#fa10aa5c58a2cb6afcf2c9ffa8cb4d8b3d489a2d"
+ integrity sha512-HiU3zKkSU6scTidmnFJ0bMX8hz5ixC93b4MHMiYebmk2lUVNGOboPsqQvx5LzooihijUoLR/v7Nc1rbBtnc7FA==
dependencies:
- jsonparse "^1.2.0"
- through ">=2.2.7 <3"
+ "@babel/helper-plugin-utils" "^7.0.0"
-abab@^1.0.4:
- version "1.0.4"
- resolved "http://registry.npm.taobao.org/abab/download/abab-1.0.4.tgz#5faad9c2c07f60dd76770f71cf025b62a63cfd4e"
+"@babel/plugin-transform-modules-amd@^7.5.0":
+ version "7.5.0"
+ resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.5.0.tgz#ef00435d46da0a5961aa728a1d2ecff063e4fb91"
+ integrity sha512-n20UsQMKnWrltocZZm24cRURxQnWIvsABPJlw/fvoy9c6AgHZzoelAIzajDHAQrDpuKFFPPcFGd7ChsYuIUMpg==
+ dependencies:
+ "@babel/helper-module-transforms" "^7.1.0"
+ "@babel/helper-plugin-utils" "^7.0.0"
+ babel-plugin-dynamic-import-node "^2.3.0"
-abbrev@1:
- version "1.1.1"
- resolved "http://registry.npm.taobao.org/abbrev/download/abbrev-1.1.1.tgz#f8f2c887ad10bf67f634f005b6987fed3179aac8"
+"@babel/plugin-transform-modules-commonjs@^7.5.0":
+ version "7.5.0"
+ resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.5.0.tgz#425127e6045231360858eeaa47a71d75eded7a74"
+ integrity sha512-xmHq0B+ytyrWJvQTc5OWAC4ii6Dhr0s22STOoydokG51JjWhyYo5mRPXoi+ZmtHQhZZwuXNN+GG5jy5UZZJxIQ==
+ dependencies:
+ "@babel/helper-module-transforms" "^7.4.4"
+ "@babel/helper-plugin-utils" "^7.0.0"
+ "@babel/helper-simple-access" "^7.1.0"
+ babel-plugin-dynamic-import-node "^2.3.0"
-accepts@~1.3.4, accepts@~1.3.5:
- version "1.3.5"
- resolved "http://registry.npm.taobao.org/accepts/download/accepts-1.3.5.tgz#eb777df6011723a3b14e8a72c0805c8e86746bd2"
+"@babel/plugin-transform-modules-systemjs@^7.5.0":
+ version "7.5.0"
+ resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.5.0.tgz#e75266a13ef94202db2a0620977756f51d52d249"
+ integrity sha512-Q2m56tyoQWmuNGxEtUyeEkm6qJYFqs4c+XyXH5RAuYxObRNz9Zgj/1g2GMnjYp2EUyEy7YTrxliGCXzecl/vJg==
dependencies:
- mime-types "~2.1.18"
- negotiator "0.6.1"
+ "@babel/helper-hoist-variables" "^7.4.4"
+ "@babel/helper-plugin-utils" "^7.0.0"
+ babel-plugin-dynamic-import-node "^2.3.0"
-acorn-dynamic-import@^2.0.0:
- version "2.0.2"
- resolved "http://registry.npm.taobao.org/acorn-dynamic-import/download/acorn-dynamic-import-2.0.2.tgz#c752bd210bef679501b6c6cb7fc84f8f47158cc4"
+"@babel/plugin-transform-modules-umd@^7.2.0":
+ version "7.2.0"
+ resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.2.0.tgz#7678ce75169f0877b8eb2235538c074268dd01ae"
+ integrity sha512-BV3bw6MyUH1iIsGhXlOK6sXhmSarZjtJ/vMiD9dNmpY8QXFFQTj+6v92pcfy1iqa8DeAfJFwoxcrS/TUZda6sw==
dependencies:
- acorn "^4.0.3"
+ "@babel/helper-module-transforms" "^7.1.0"
+ "@babel/helper-plugin-utils" "^7.0.0"
-acorn-globals@^4.1.0:
- version "4.1.0"
- resolved "http://registry.npm.taobao.org/acorn-globals/download/acorn-globals-4.1.0.tgz#ab716025dbe17c54d3ef81d32ece2b2d99fe2538"
+"@babel/plugin-transform-named-capturing-groups-regex@^7.4.5":
+ version "7.4.5"
+ resolved "https://registry.yarnpkg.com/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.4.5.tgz#9d269fd28a370258199b4294736813a60bbdd106"
+ integrity sha512-z7+2IsWafTBbjNsOxU/Iv5CvTJlr5w4+HGu1HovKYTtgJ362f7kBcQglkfmlspKKZ3bgrbSGvLfNx++ZJgCWsg==
dependencies:
- acorn "^5.0.0"
+ regexp-tree "^0.1.6"
-acorn@^4.0.3:
- version "4.0.13"
- resolved "http://registry.npm.taobao.org/acorn/download/acorn-4.0.13.tgz#105495ae5361d697bd195c825192e1ad7f253787"
+"@babel/plugin-transform-new-target@^7.4.4":
+ version "7.4.4"
+ resolved "https://registry.yarnpkg.com/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.4.4.tgz#18d120438b0cc9ee95a47f2c72bc9768fbed60a5"
+ integrity sha512-r1z3T2DNGQwwe2vPGZMBNjioT2scgWzK9BCnDEh+46z8EEwXBq24uRzd65I7pjtugzPSj921aM15RpESgzsSuA==
+ dependencies:
+ "@babel/helper-plugin-utils" "^7.0.0"
-acorn@^5.0.0, acorn@^5.3.0:
- version "5.5.3"
- resolved "http://registry.npm.taobao.org/acorn/download/acorn-5.5.3.tgz#f473dd47e0277a08e28e9bec5aeeb04751f0b8c9"
+"@babel/plugin-transform-object-super@^7.2.0":
+ version "7.2.0"
+ resolved "https://registry.yarnpkg.com/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.2.0.tgz#b35d4c10f56bab5d650047dad0f1d8e8814b6598"
+ integrity sha512-VMyhPYZISFZAqAPVkiYb7dUe2AsVi2/wCT5+wZdsNO31FojQJa9ns40hzZ6U9f50Jlq4w6qwzdBB2uwqZ00ebg==
+ dependencies:
+ "@babel/helper-plugin-utils" "^7.0.0"
+ "@babel/helper-replace-supers" "^7.1.0"
[email protected]:
- version "1.0.2"
- resolved "http://registry.npm.taobao.org/add-dom-event-listener/download/add-dom-event-listener-1.0.2.tgz#8faed2c41008721cf111da1d30d995b85be42bed"
+"@babel/plugin-transform-parameters@^7.4.4":
+ version "7.4.4"
+ resolved "https://registry.yarnpkg.com/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.4.4.tgz#7556cf03f318bd2719fe4c922d2d808be5571e16"
+ integrity sha512-oMh5DUO1V63nZcu/ZVLQFqiihBGo4OpxJxR1otF50GMeCLiRx5nUdtokd+u9SuVJrvvuIh9OosRFPP4pIPnwmw==
dependencies:
- object-assign "4.x"
+ "@babel/helper-call-delegate" "^7.4.4"
+ "@babel/helper-get-function-arity" "^7.0.0"
+ "@babel/helper-plugin-utils" "^7.0.0"
-add-dom-event-listener@^1.1.0:
- version "1.1.0"
- resolved "http://registry.npm.taobao.org/add-dom-event-listener/download/add-dom-event-listener-1.1.0.tgz#6a92db3a0dd0abc254e095c0f1dc14acbbaae310"
- integrity sha1-apLbOg3Qq8JU4JXA8dwUrLuq4xA=
+"@babel/plugin-transform-property-literals@^7.2.0":
+ version "7.2.0"
+ resolved "https://registry.yarnpkg.com/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.2.0.tgz#03e33f653f5b25c4eb572c98b9485055b389e905"
+ integrity sha512-9q7Dbk4RhgcLp8ebduOpCbtjh7C0itoLYHXd9ueASKAG/is5PQtMR5VJGka9NKqGhYEGn5ITahd4h9QeBMylWQ==
dependencies:
- object-assign "4.x"
+ "@babel/helper-plugin-utils" "^7.0.0"
[email protected], address@^1.0.1:
- version "1.0.3"
- resolved "http://registry.npm.taobao.org/address/download/address-1.0.3.tgz#b5f50631f8d6cec8bd20c963963afb55e06cbce9"
+"@babel/plugin-transform-react-display-name@^7.0.0":
+ version "7.2.0"
+ resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-display-name/-/plugin-transform-react-display-name-7.2.0.tgz#ebfaed87834ce8dc4279609a4f0c324c156e3eb0"
+ integrity sha512-Htf/tPa5haZvRMiNSQSFifK12gtr/8vwfr+A9y69uF0QcU77AVu4K7MiHEkTxF7lQoHOL0F9ErqgfNEAKgXj7A==
+ dependencies:
+ "@babel/helper-plugin-utils" "^7.0.0"
-ajv-keywords@^3.1.0:
- version "3.2.0"
- resolved "http://registry.npm.taobao.org/ajv-keywords/download/ajv-keywords-3.2.0.tgz#e86b819c602cf8821ad637413698f1dec021847a"
+"@babel/plugin-transform-react-jsx-self@^7.0.0":
+ version "7.2.0"
+ resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx-self/-/plugin-transform-react-jsx-self-7.2.0.tgz#461e21ad9478f1031dd5e276108d027f1b5240ba"
+ integrity sha512-v6S5L/myicZEy+jr6ielB0OR8h+EH/1QFx/YJ7c7Ua+7lqsjj/vW6fD5FR9hB/6y7mGbfT4vAURn3xqBxsUcdg==
+ dependencies:
+ "@babel/helper-plugin-utils" "^7.0.0"
+ "@babel/plugin-syntax-jsx" "^7.2.0"
-ajv@^5.0.0, ajv@^5.1.0:
- version "5.5.2"
- resolved "http://registry.npm.taobao.org/ajv/download/ajv-5.5.2.tgz#73b5eeca3fab653e3d3f9422b341ad42205dc965"
+"@babel/plugin-transform-react-jsx-source@^7.0.0":
+ version "7.5.0"
+ resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx-source/-/plugin-transform-react-jsx-source-7.5.0.tgz#583b10c49cf057e237085bcbd8cc960bd83bd96b"
+ integrity sha512-58Q+Jsy4IDCZx7kqEZuSDdam/1oW8OdDX8f+Loo6xyxdfg1yF0GE2XNJQSTZCaMol93+FBzpWiPEwtbMloAcPg==
dependencies:
- co "^4.6.0"
- fast-deep-equal "^1.0.0"
- fast-json-stable-stringify "^2.0.0"
- json-schema-traverse "^0.3.0"
+ "@babel/helper-plugin-utils" "^7.0.0"
+ "@babel/plugin-syntax-jsx" "^7.2.0"
-ajv@^6.1.0:
- version "6.5.0"
- resolved "http://registry.npm.taobao.org/ajv/download/ajv-6.5.0.tgz#4c8affdf80887d8f132c9c52ab8a2dc4d0b7b24c"
+"@babel/plugin-transform-react-jsx@^7.0.0":
+ version "7.3.0"
+ resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx/-/plugin-transform-react-jsx-7.3.0.tgz#f2cab99026631c767e2745a5368b331cfe8f5290"
+ integrity sha512-a/+aRb7R06WcKvQLOu4/TpjKOdvVEKRLWFpKcNuHhiREPgGRB4TQJxq07+EZLS8LFVYpfq1a5lDUnuMdcCpBKg==
dependencies:
- fast-deep-equal "^2.0.1"
- fast-json-stable-stringify "^2.0.0"
- json-schema-traverse "^0.3.0"
- uri-js "^4.2.1"
+ "@babel/helper-builder-react-jsx" "^7.3.0"
+ "@babel/helper-plugin-utils" "^7.0.0"
+ "@babel/plugin-syntax-jsx" "^7.2.0"
-align-text@^0.1.1, align-text@^0.1.3:
- version "0.1.4"
- resolved "http://registry.npm.taobao.org/align-text/download/align-text-0.1.4.tgz#0cd90a561093f35d0a99256c22b7069433fad117"
+"@babel/plugin-transform-regenerator@^7.4.5":
+ version "7.4.5"
+ resolved "https://registry.yarnpkg.com/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.4.5.tgz#629dc82512c55cee01341fb27bdfcb210354680f"
+ integrity sha512-gBKRh5qAaCWntnd09S8QC7r3auLCqq5DI6O0DlfoyDjslSBVqBibrMdsqO+Uhmx3+BlOmE/Kw1HFxmGbv0N9dA==
dependencies:
- kind-of "^3.0.2"
- longest "^1.0.1"
- repeat-string "^1.5.2"
+ regenerator-transform "^0.14.0"
-alphanum-sort@^1.0.1, alphanum-sort@^1.0.2:
- version "1.0.2"
- resolved "http://registry.npm.taobao.org/alphanum-sort/download/alphanum-sort-1.0.2.tgz#97a1119649b211ad33691d9f9f486a8ec9fbe0a3"
+"@babel/plugin-transform-reserved-words@^7.2.0":
+ version "7.2.0"
+ resolved "https://registry.yarnpkg.com/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.2.0.tgz#4792af87c998a49367597d07fedf02636d2e1634"
+ integrity sha512-fz43fqW8E1tAB3DKF19/vxbpib1fuyCwSPE418ge5ZxILnBhWyhtPgz8eh1RCGGJlwvksHkyxMxh0eenFi+kFw==
+ dependencies:
+ "@babel/helper-plugin-utils" "^7.0.0"
-amdefine@>=0.0.4:
- version "1.0.1"
- resolved "http://registry.npm.taobao.org/amdefine/download/amdefine-1.0.1.tgz#4a5282ac164729e93619bcfd3ad151f817ce91f5"
+"@babel/plugin-transform-shorthand-properties@^7.2.0":
+ version "7.2.0"
+ resolved "https://registry.yarnpkg.com/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.2.0.tgz#6333aee2f8d6ee7e28615457298934a3b46198f0"
+ integrity sha512-QP4eUM83ha9zmYtpbnyjTLAGKQritA5XW/iG9cjtuOI8s1RuL/3V6a3DeSHfKutJQ+ayUfeZJPcnCYEQzaPQqg==
+ dependencies:
+ "@babel/helper-plugin-utils" "^7.0.0"
-ansi-escapes@^1.1.0:
- version "1.4.0"
- resolved "http://registry.npm.taobao.org/ansi-escapes/download/ansi-escapes-1.4.0.tgz#d3a8a83b319aa67793662b13e761c7911422306e"
+"@babel/plugin-transform-spread@^7.2.0":
+ version "7.2.2"
+ resolved "https://registry.yarnpkg.com/@babel/plugin-transform-spread/-/plugin-transform-spread-7.2.2.tgz#3103a9abe22f742b6d406ecd3cd49b774919b406"
+ integrity sha512-KWfky/58vubwtS0hLqEnrWJjsMGaOeSBn90Ezn5Jeg9Z8KKHmELbP1yGylMlm5N6TPKeY9A2+UaSYLdxahg01w==
+ dependencies:
+ "@babel/helper-plugin-utils" "^7.0.0"
-ansi-escapes@^3.0.0:
- version "3.1.0"
- resolved "http://registry.npm.taobao.org/ansi-escapes/download/ansi-escapes-3.1.0.tgz#f73207bb81207d75fd6c83f125af26eea378ca30"
+"@babel/plugin-transform-sticky-regex@^7.2.0":
+ version "7.2.0"
+ resolved "https://registry.yarnpkg.com/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.2.0.tgz#a1e454b5995560a9c1e0d537dfc15061fd2687e1"
+ integrity sha512-KKYCoGaRAf+ckH8gEL3JHUaFVyNHKe3ASNsZ+AlktgHevvxGigoIttrEJb8iKN03Q7Eazlv1s6cx2B2cQ3Jabw==
+ dependencies:
+ "@babel/helper-plugin-utils" "^7.0.0"
+ "@babel/helper-regex" "^7.0.0"
[email protected]:
- version "0.0.7"
- resolved "http://registry.npm.taobao.org/ansi-html/download/ansi-html-0.0.7.tgz#813584021962a9e9e6fd039f940d12f56ca7859e"
+"@babel/plugin-transform-template-literals@^7.4.4":
+ version "7.4.4"
+ resolved "https://registry.yarnpkg.com/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.4.4.tgz#9d28fea7bbce637fb7612a0750989d8321d4bcb0"
+ integrity sha512-mQrEC4TWkhLN0z8ygIvEL9ZEToPhG5K7KDW3pzGqOfIGZ28Jb0POUkeWcoz8HnHvhFy6dwAT1j8OzqN8s804+g==
+ dependencies:
+ "@babel/helper-annotate-as-pure" "^7.0.0"
+ "@babel/helper-plugin-utils" "^7.0.0"
-ansi-regex@^2.0.0:
- version "2.1.1"
- resolved "http://registry.npm.taobao.org/ansi-regex/download/ansi-regex-2.1.1.tgz#c3b33ab5ee360d86e0e628f0468ae7ef27d654df"
+"@babel/plugin-transform-typeof-symbol@^7.2.0":
+ version "7.2.0"
+ resolved "https://registry.yarnpkg.com/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.2.0.tgz#117d2bcec2fbf64b4b59d1f9819894682d29f2b2"
+ integrity sha512-2LNhETWYxiYysBtrBTqL8+La0jIoQQnIScUJc74OYvUGRmkskNY4EzLCnjHBzdmb38wqtTaixpo1NctEcvMDZw==
+ dependencies:
+ "@babel/helper-plugin-utils" "^7.0.0"
+
+"@babel/plugin-transform-typescript@^7.3.2":
+ version "7.5.0"
+ resolved "https://registry.yarnpkg.com/@babel/plugin-transform-typescript/-/plugin-transform-typescript-7.5.0.tgz#a0855287eec87fe83c11e8dad67d431d343b53b1"
+ integrity sha512-z3T4P70XJFUAHzLtEsmJ37BGVDj+55/KX8W8TBSBF0qk0KLazw8xlwVcRHacxNPgprzTdI4QWW+2eS6bTkQbCA==
+ dependencies:
+ "@babel/helper-create-class-features-plugin" "^7.5.0"
+ "@babel/helper-plugin-utils" "^7.0.0"
+ "@babel/plugin-syntax-typescript" "^7.2.0"
+
+"@babel/plugin-transform-unicode-regex@^7.4.4":
+ version "7.4.4"
+ resolved "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.4.4.tgz#ab4634bb4f14d36728bf5978322b35587787970f"
+ integrity sha512-il+/XdNw01i93+M9J9u4T7/e/Ue/vWfNZE4IRUQjplu2Mqb/AFTDimkw2tdEdSH50wuQXZAbXSql0UphQke+vA==
+ dependencies:
+ "@babel/helper-plugin-utils" "^7.0.0"
+ "@babel/helper-regex" "^7.4.4"
+ regexpu-core "^4.5.4"
+
+"@babel/preset-env@^7.4.3":
+ version "7.5.0"
+ resolved "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.5.0.tgz#1122a751e864850b4dbce38bd9b4497840ee6f01"
+ integrity sha512-/5oQ7cYg+6sH9Dt9yx5IiylnLPiUdyMHl5y+K0mKVNiW2wJ7FpU5bg8jKcT8PcCbxdYzfv6OuC63jLEtMuRSmQ==
+ dependencies:
+ "@babel/helper-module-imports" "^7.0.0"
+ "@babel/helper-plugin-utils" "^7.0.0"
+ "@babel/plugin-proposal-async-generator-functions" "^7.2.0"
+ "@babel/plugin-proposal-dynamic-import" "^7.5.0"
+ "@babel/plugin-proposal-json-strings" "^7.2.0"
+ "@babel/plugin-proposal-object-rest-spread" "^7.5.0"
+ "@babel/plugin-proposal-optional-catch-binding" "^7.2.0"
+ "@babel/plugin-proposal-unicode-property-regex" "^7.4.4"
+ "@babel/plugin-syntax-async-generators" "^7.2.0"
+ "@babel/plugin-syntax-dynamic-import" "^7.2.0"
+ "@babel/plugin-syntax-json-strings" "^7.2.0"
+ "@babel/plugin-syntax-object-rest-spread" "^7.2.0"
+ "@babel/plugin-syntax-optional-catch-binding" "^7.2.0"
+ "@babel/plugin-transform-arrow-functions" "^7.2.0"
+ "@babel/plugin-transform-async-to-generator" "^7.5.0"
+ "@babel/plugin-transform-block-scoped-functions" "^7.2.0"
+ "@babel/plugin-transform-block-scoping" "^7.4.4"
+ "@babel/plugin-transform-classes" "^7.4.4"
+ "@babel/plugin-transform-computed-properties" "^7.2.0"
+ "@babel/plugin-transform-destructuring" "^7.5.0"
+ "@babel/plugin-transform-dotall-regex" "^7.4.4"
+ "@babel/plugin-transform-duplicate-keys" "^7.5.0"
+ "@babel/plugin-transform-exponentiation-operator" "^7.2.0"
+ "@babel/plugin-transform-for-of" "^7.4.4"
+ "@babel/plugin-transform-function-name" "^7.4.4"
+ "@babel/plugin-transform-literals" "^7.2.0"
+ "@babel/plugin-transform-member-expression-literals" "^7.2.0"
+ "@babel/plugin-transform-modules-amd" "^7.5.0"
+ "@babel/plugin-transform-modules-commonjs" "^7.5.0"
+ "@babel/plugin-transform-modules-systemjs" "^7.5.0"
+ "@babel/plugin-transform-modules-umd" "^7.2.0"
+ "@babel/plugin-transform-named-capturing-groups-regex" "^7.4.5"
+ "@babel/plugin-transform-new-target" "^7.4.4"
+ "@babel/plugin-transform-object-super" "^7.2.0"
+ "@babel/plugin-transform-parameters" "^7.4.4"
+ "@babel/plugin-transform-property-literals" "^7.2.0"
+ "@babel/plugin-transform-regenerator" "^7.4.5"
+ "@babel/plugin-transform-reserved-words" "^7.2.0"
+ "@babel/plugin-transform-shorthand-properties" "^7.2.0"
+ "@babel/plugin-transform-spread" "^7.2.0"
+ "@babel/plugin-transform-sticky-regex" "^7.2.0"
+ "@babel/plugin-transform-template-literals" "^7.4.4"
+ "@babel/plugin-transform-typeof-symbol" "^7.2.0"
+ "@babel/plugin-transform-unicode-regex" "^7.4.4"
+ "@babel/types" "^7.5.0"
+ browserslist "^4.6.0"
+ core-js-compat "^3.1.1"
+ invariant "^2.2.2"
+ js-levenshtein "^1.1.3"
+ semver "^5.5.0"
-ansi-regex@^3.0.0:
- version "3.0.0"
- resolved "http://registry.npm.taobao.org/ansi-regex/download/ansi-regex-3.0.0.tgz#ed0317c322064f79466c02966bddb605ab37d998"
+"@babel/preset-react@^7.0.0":
+ version "7.0.0"
+ resolved "https://registry.yarnpkg.com/@babel/preset-react/-/preset-react-7.0.0.tgz#e86b4b3d99433c7b3e9e91747e2653958bc6b3c0"
+ integrity sha512-oayxyPS4Zj+hF6Et11BwuBkmpgT/zMxyuZgFrMeZID6Hdh3dGlk4sHCAhdBCpuCKW2ppBfl2uCCetlrUIJRY3w==
+ dependencies:
+ "@babel/helper-plugin-utils" "^7.0.0"
+ "@babel/plugin-transform-react-display-name" "^7.0.0"
+ "@babel/plugin-transform-react-jsx" "^7.0.0"
+ "@babel/plugin-transform-react-jsx-self" "^7.0.0"
+ "@babel/plugin-transform-react-jsx-source" "^7.0.0"
+
+"@babel/preset-typescript@^7.3.3":
+ version "7.3.3"
+ resolved "https://registry.yarnpkg.com/@babel/preset-typescript/-/preset-typescript-7.3.3.tgz#88669911053fa16b2b276ea2ede2ca603b3f307a"
+ integrity sha512-mzMVuIP4lqtn4du2ynEfdO0+RYcslwrZiJHXu4MGaC1ctJiW2fyaeDrtjJGs7R/KebZ1sgowcIoWf4uRpEfKEg==
+ dependencies:
+ "@babel/helper-plugin-utils" "^7.0.0"
+ "@babel/plugin-transform-typescript" "^7.3.2"
+
+"@babel/template@^7.1.0", "@babel/template@^7.4.0", "@babel/template@^7.4.4":
+ version "7.4.4"
+ resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.4.4.tgz#f4b88d1225689a08f5bc3a17483545be9e4ed237"
+ integrity sha512-CiGzLN9KgAvgZsnivND7rkA+AeJ9JB0ciPOD4U59GKbQP2iQl+olF1l76kJOupqidozfZ32ghwBEJDhnk9MEcw==
+ dependencies:
+ "@babel/code-frame" "^7.0.0"
+ "@babel/parser" "^7.4.4"
+ "@babel/types" "^7.4.4"
+
+"@babel/traverse@^7.1.0", "@babel/traverse@^7.4.3", "@babel/traverse@^7.4.4", "@babel/traverse@^7.5.0":
+ version "7.5.0"
+ resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.5.0.tgz#4216d6586854ef5c3c4592dab56ec7eb78485485"
+ integrity sha512-SnA9aLbyOCcnnbQEGwdfBggnc142h/rbqqsXcaATj2hZcegCl903pUD/lfpsNBlBSuWow/YDfRyJuWi2EPR5cg==
+ dependencies:
+ "@babel/code-frame" "^7.0.0"
+ "@babel/generator" "^7.5.0"
+ "@babel/helper-function-name" "^7.1.0"
+ "@babel/helper-split-export-declaration" "^7.4.4"
+ "@babel/parser" "^7.5.0"
+ "@babel/types" "^7.5.0"
+ debug "^4.1.0"
+ globals "^11.1.0"
+ lodash "^4.17.11"
+
+"@babel/types@^7.0.0", "@babel/types@^7.2.0", "@babel/types@^7.3.0", "@babel/types@^7.4.0", "@babel/types@^7.4.4", "@babel/types@^7.5.0":
+ version "7.5.0"
+ resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.5.0.tgz#e47d43840c2e7f9105bc4d3a2c371b4d0c7832ab"
+ integrity sha512-UFpDVqRABKsW01bvw7/wSUe56uy6RXM5+VJibVVAybDGxEW25jdwiFJEf7ASvSaC7sN7rbE/l3cLp2izav+CtQ==
+ dependencies:
+ esutils "^2.0.2"
+ lodash "^4.17.11"
+ to-fast-properties "^2.0.0"
-ansi-styles@^2.2.1:
- version "2.2.1"
- resolved "http://registry.npm.taobao.org/ansi-styles/download/ansi-styles-2.2.1.tgz#b432dd3358b634cf75e1e4664368240533c1ddbe"
+"@cnakazawa/watch@^1.0.3":
+ version "1.0.3"
+ resolved "https://registry.yarnpkg.com/@cnakazawa/watch/-/watch-1.0.3.tgz#099139eaec7ebf07a27c1786a3ff64f39464d2ef"
+ integrity sha512-r5160ogAvGyHsal38Kux7YYtodEKOj89RGb28ht1jh3SJb08VwRwAKKJL0bGb04Zd/3r9FL3BFIc3bBidYffCA==
+ dependencies:
+ exec-sh "^0.3.2"
+ minimist "^1.2.0"
-ansi-styles@^3.2.0, ansi-styles@^3.2.1:
- version "3.2.1"
- resolved "http://registry.npm.taobao.org/ansi-styles/download/ansi-styles-3.2.1.tgz#41fbb20243e50b12be0f04b8dedbf07520ce841d"
+"@commitlint/cli@^8.0.0":
+ version "8.0.0"
+ resolved "https://registry.yarnpkg.com/@commitlint/cli/-/cli-8.0.0.tgz#1be7aa14fecbcf71317a8187fbb5210760d4ca61"
+ integrity sha512-wFu+g9v73I2rMRTv27ItIbcrhWqge0ZpUNUIJ9fw8TF7XpmhaUFvGqa2kU6st1F0TyEOrq5ZMzwI8kQZNVLuXg==
dependencies:
- color-convert "^1.9.0"
+ "@commitlint/format" "^8.0.0"
+ "@commitlint/lint" "^8.0.0"
+ "@commitlint/load" "^8.0.0"
+ "@commitlint/read" "^8.0.0"
+ babel-polyfill "6.26.0"
+ chalk "2.3.1"
+ get-stdin "7.0.0"
+ lodash "4.17.11"
+ meow "5.0.0"
+ resolve-from "5.0.0"
+ resolve-global "1.0.0"
[email protected]:
- version "3.7.3"
- resolved "http://registry.npm.taobao.org/antd/download/antd-3.7.3.tgz#4f99b9aa23ab95d7b6ebb7405c25d80a8914f28c"
- integrity sha1-T5m5qiOrlde267dAXCXYCokU8ow=
- dependencies:
- array-tree-filter "^2.0.0"
- babel-runtime "6.x"
- classnames "~2.2.0"
- create-react-class "^15.6.0"
- create-react-context "^0.2.2"
- css-animation "^1.2.5"
- dom-closest "^0.2.0"
- enquire.js "^2.1.1"
- intersperse "^1.0.0"
- lodash "^4.17.5"
- moment "^2.19.3"
- omit.js "^1.0.0"
- prop-types "^15.5.7"
- raf "^3.4.0"
- rc-animate "^2.4.1"
- rc-calendar "~9.6.0"
- rc-cascader "~0.14.0"
- rc-checkbox "~2.1.5"
- rc-collapse "~1.9.0"
- rc-dialog "~7.1.0"
- rc-drawer "~1.6.2"
- rc-dropdown "~2.2.0"
- rc-editor-mention "^1.0.2"
- rc-form "^2.1.0"
- rc-input-number "~4.0.0"
- rc-menu "~7.0.2"
- rc-notification "~3.1.1"
- rc-pagination "~1.16.1"
- rc-progress "~2.2.2"
- rc-rate "~2.4.0"
- rc-select "~8.0.7"
- rc-slider "~8.6.0"
- rc-steps "~3.1.0"
- rc-switch "~1.6.0"
- rc-table "~6.2.2"
- rc-tabs "~9.2.0"
- rc-time-picker "~3.3.0"
- rc-tooltip "~3.7.0"
- rc-tree "~1.12.0"
- rc-tree-select "~2.0.5"
- rc-trigger "^2.5.4"
- rc-upload "~2.5.0"
- rc-util "^4.0.4"
- react-lazy-load "^3.0.12"
- react-lifecycles-compat "^3.0.2"
- react-slick "~0.23.1"
- shallowequal "^1.0.1"
- warning "~4.0.1"
-
-anymatch@^1.3.0:
- version "1.3.2"
- resolved "http://registry.npm.taobao.org/anymatch/download/anymatch-1.3.2.tgz#553dcb8f91e3c889845dfdba34c77721b90b9d7a"
+"@commitlint/config-conventional@^8.0.0":
+ version "8.0.0"
+ resolved "https://registry.yarnpkg.com/@commitlint/config-conventional/-/config-conventional-8.0.0.tgz#f45349cab9dcfc08a30fbcf2b6317506e17bc8e6"
+ integrity sha512-umg1irroowOV+x8oZPBw8woCogZO5MFKUYQq+fRZvhowoSwDHXYILP3ETcdHUgvytw/K/a8Xvu7iCypK6oZQ+g==
+
+"@commitlint/ensure@^8.0.0":
+ version "8.0.0"
+ resolved "https://registry.yarnpkg.com/@commitlint/ensure/-/ensure-8.0.0.tgz#67a3e72755a0dfa5f4216efd05238f62ff132110"
+ integrity sha512-rhBO79L9vXeb26JU+14cxZQq46KyyVqlo31C33VIe7oJndUtWrDhZTvMjJeB1pdXh4EU4XWdMo+yzBmuypFgig==
dependencies:
- micromatch "^2.1.5"
- normalize-path "^2.0.0"
+ lodash "4.17.11"
-anymatch@^2.0.0:
- version "2.0.0"
- resolved "http://registry.npm.taobao.org/anymatch/download/anymatch-2.0.0.tgz#bcb24b4f37934d9aa7ac17b4adaf89e7c76ef2eb"
+"@commitlint/execute-rule@^8.0.0":
+ version "8.0.0"
+ resolved "https://registry.yarnpkg.com/@commitlint/execute-rule/-/execute-rule-8.0.0.tgz#df2a9893f162fc561ca4e95a34bd782469dd7f8b"
+ integrity sha512-E/A2xHqx3syclXAFl8vJY2o/+xtL9axrqbFFF42Bzke+Eflf0mOJviPxDodu2xP0wXMRQ9UokAi/reK9dMtA/A==
dependencies:
- micromatch "^3.1.4"
- normalize-path "^2.1.1"
+ babel-runtime "6.26.0"
-append-transform@^0.4.0:
- version "0.4.0"
- resolved "http://registry.npm.taobao.org/append-transform/download/append-transform-0.4.0.tgz#d76ebf8ca94d276e247a36bad44a4b74ab611991"
+"@commitlint/format@^8.0.0":
+ version "8.0.0"
+ resolved "https://registry.yarnpkg.com/@commitlint/format/-/format-8.0.0.tgz#f7c858d9057e1da6856be211ad049c5b9a66185b"
+ integrity sha512-dFxKGLp1T4obi7+YZ2NcSAebJA/dBQwnerRJGz0hWtsO6pheJRe+qC50+GCb2fYGWUc5lIWawaRts0m7RkFGUw==
dependencies:
- default-require-extensions "^1.0.0"
+ chalk "^2.0.1"
-aproba@^1.0.3, aproba@^1.1.1:
- version "1.2.0"
- resolved "http://registry.npm.taobao.org/aproba/download/aproba-1.2.0.tgz#6802e6264efd18c790a1b0d517f0f2627bf2c94a"
+"@commitlint/is-ignored@^8.0.0":
+ version "8.0.0"
+ resolved "https://registry.yarnpkg.com/@commitlint/is-ignored/-/is-ignored-8.0.0.tgz#eba06c9a6227288574f544a1705583d965f0ed65"
+ integrity sha512-geWr/NXGMrZ3qc3exDM+S1qV+nMDxp1LwN3rLpEN2gXTwW3rIXq49RQQUkn0n3BHcpqJJ9EBhjqFoMU1TYx7Ng==
+ dependencies:
+ semver "6.0.0"
-archiver-utils@^1.3.0:
- version "1.3.0"
- resolved "http://registry.npm.taobao.org/archiver-utils/download/archiver-utils-1.3.0.tgz#e50b4c09c70bf3d680e32ff1b7994e9f9d895174"
+"@commitlint/lint@^8.0.0":
+ version "8.0.0"
+ resolved "https://registry.yarnpkg.com/@commitlint/lint/-/lint-8.0.0.tgz#3defb3b1a900ba966c64a51b497bf1fcff5fc9f2"
+ integrity sha512-5nKiJpBDR2iei+fre4+6M7FUrSX1cIMoxXKdrnb1GMOXkw9CsZSF5OvdrX08zHAFmOAeDaohoCV+XN/UN/vWYg==
dependencies:
- glob "^7.0.0"
- graceful-fs "^4.1.0"
- lazystream "^1.0.0"
- lodash "^4.8.0"
- normalize-path "^2.0.0"
- readable-stream "^2.0.0"
+ "@commitlint/is-ignored" "^8.0.0"
+ "@commitlint/parse" "^8.0.0"
+ "@commitlint/rules" "^8.0.0"
+ babel-runtime "^6.23.0"
+ lodash "4.17.11"
-archiver@^2.1.1:
- version "2.1.1"
- resolved "http://registry.npm.taobao.org/archiver/download/archiver-2.1.1.tgz#ff662b4a78201494a3ee544d3a33fe7496509ebc"
+"@commitlint/load@^8.0.0":
+ version "8.0.0"
+ resolved "https://registry.yarnpkg.com/@commitlint/load/-/load-8.0.0.tgz#5eacfb96635e9aeac8f1a0674491f29483348872"
+ integrity sha512-JXC3YjO7hN7Rv2Z/SaYz+oIvShsQWLL7gnOCe8+YgI1EusBqjV4mPI0HnBXVe9volfdxbl+Af/GoQZs2dvyOFA==
dependencies:
- archiver-utils "^1.3.0"
- async "^2.0.0"
- buffer-crc32 "^0.2.1"
- glob "^7.0.0"
- lodash "^4.8.0"
- readable-stream "^2.0.0"
- tar-stream "^1.5.0"
- zip-stream "^1.2.0"
+ "@commitlint/execute-rule" "^8.0.0"
+ "@commitlint/resolve-extends" "^8.0.0"
+ babel-runtime "^6.23.0"
+ cosmiconfig "^5.2.0"
+ lodash "4.17.11"
+ resolve-from "^5.0.0"
-are-we-there-yet@~1.1.2:
- version "1.1.5"
- resolved "http://registry.npm.taobao.org/are-we-there-yet/download/are-we-there-yet-1.1.5.tgz#4b35c2944f062a8bfcda66410760350fe9ddfc21"
+"@commitlint/message@^8.0.0":
+ version "8.0.0"
+ resolved "https://registry.yarnpkg.com/@commitlint/message/-/message-8.0.0.tgz#bbb02fb78490808e36157d675acc544fafd7942b"
+ integrity sha512-2oGUV8630nzsj17t6akq3mFguzWePADO069IwKJi+CN5L0YRBQj9zGRCB0P+zvh4EngjqMnuMwhEhaBEM8TTzA==
+
+"@commitlint/parse@^8.0.0":
+ version "8.0.0"
+ resolved "https://registry.yarnpkg.com/@commitlint/parse/-/parse-8.0.0.tgz#4b5fa19ab8bdb2c6452b7dbdf1d7adf52386ae60"
+ integrity sha512-6CyweJrBkI+Jqx7qkpYgVx2muBMoUZAZHWhUTgqHIDDmI+3d4UPZ2plGS2G0969KkHCgjtlwnwTjWqA9HLMwPA==
dependencies:
- delegates "^1.0.0"
- readable-stream "^2.0.6"
+ conventional-changelog-angular "^1.3.3"
+ conventional-commits-parser "^2.1.0"
+ lodash "^4.17.11"
-argparse@^1.0.7:
- version "1.0.10"
- resolved "http://registry.npm.taobao.org/argparse/download/argparse-1.0.10.tgz#bcd6791ea5ae09725e17e5ad988134cd40b3d911"
+"@commitlint/read@^8.0.0":
+ version "8.0.0"
+ resolved "https://registry.yarnpkg.com/@commitlint/read/-/read-8.0.0.tgz#5149fcb2550a07e7eb6a9f50b88df742780fa1e8"
+ integrity sha512-IhNMiKPqkB5yxphe/FiOKgX2uCysbR8fGK6KOXON3uJaVND0dctxnfdv+vY9gDv2CtjIXgNFO+v6FLnqMfIvwA==
dependencies:
- sprintf-js "~1.0.2"
+ "@commitlint/top-level" "^8.0.0"
+ "@marionebl/sander" "^0.6.0"
+ babel-runtime "^6.23.0"
+ git-raw-commits "^1.3.0"
-arr-diff@^2.0.0:
- version "2.0.0"
- resolved "http://registry.npm.taobao.org/arr-diff/download/arr-diff-2.0.0.tgz#8f3b827f955a8bd669697e4a4256ac3ceae356cf"
+"@commitlint/resolve-extends@^8.0.0":
+ version "8.0.0"
+ resolved "https://registry.yarnpkg.com/@commitlint/resolve-extends/-/resolve-extends-8.0.0.tgz#dc606cecb0f392d57905cfd690d8f736ad26eec2"
+ integrity sha512-SPkH+dXMCpYboVwpIhtOhpg1xYdE7L77fuHmEJWveXSmgfi0GosFm4aJ7Cer9DjNjW+KbD0TUfzZU0TrYUESjQ==
dependencies:
- arr-flatten "^1.0.1"
+ babel-runtime "6.26.0"
+ import-fresh "^3.0.0"
+ lodash "4.17.11"
+ resolve-from "^5.0.0"
+ resolve-global "^1.0.0"
+
+"@commitlint/rules@^8.0.0":
+ version "8.0.0"
+ resolved "https://registry.yarnpkg.com/@commitlint/rules/-/rules-8.0.0.tgz#26ef50fedb5a88a2ad2af43677e5bb7c32fb5f14"
+ integrity sha512-s9BehZQP5uAc/V4lMaUxwxFabVZTw5fZ18Ase1e5tbMKVIwq/7E00Ny1czN7xSFXfgffukWznsexpfFXYpbVsg==
+ dependencies:
+ "@commitlint/ensure" "^8.0.0"
+ "@commitlint/message" "^8.0.0"
+ "@commitlint/to-lines" "^8.0.0"
+ babel-runtime "^6.23.0"
-arr-diff@^4.0.0:
- version "4.0.0"
- resolved "http://registry.npm.taobao.org/arr-diff/download/arr-diff-4.0.0.tgz#d6461074febfec71e7e15235761a329a5dc7c520"
+"@commitlint/to-lines@^8.0.0":
+ version "8.0.0"
+ resolved "https://registry.yarnpkg.com/@commitlint/to-lines/-/to-lines-8.0.0.tgz#9f7d7938404bdbb345c23c8665293e051c4dc243"
+ integrity sha512-qqgNeyj+NJ1Xffwv6hGsipKlVFj30NmfPup751MS/me0GV8IBd//njTjiqHvf/3sKm/OcGn4Re4D7YXwTcC2RA==
-arr-flatten@^1.0.1, arr-flatten@^1.1.0:
- version "1.1.0"
- resolved "http://registry.npm.taobao.org/arr-flatten/download/arr-flatten-1.1.0.tgz#36048bbff4e7b47e136644316c99669ea5ae91f1"
+"@commitlint/top-level@^8.0.0":
+ version "8.0.0"
+ resolved "https://registry.yarnpkg.com/@commitlint/top-level/-/top-level-8.0.0.tgz#3d998ba1e13be939f4227202eebae7f1dbb472a9"
+ integrity sha512-If9hwfISHV8HXGKeXUKsUvOo4DuISWiU/VC2qHsKpeHSREAxkWESmQzzwYvOtyBjMiOTfAXfzgth18g36Fz2ow==
+ dependencies:
+ find-up "^2.1.0"
-arr-union@^3.1.0:
- version "3.1.0"
- resolved "http://registry.npm.taobao.org/arr-union/download/arr-union-3.1.0.tgz#e39b09aea9def866a8f206e288af63919bae39c4"
+"@jest/console@^24.7.1":
+ version "24.7.1"
+ resolved "https://registry.yarnpkg.com/@jest/console/-/console-24.7.1.tgz#32a9e42535a97aedfe037e725bd67e954b459545"
+ integrity sha512-iNhtIy2M8bXlAOULWVTUxmnelTLFneTNEkHCgPmgd+zNwy9zVddJ6oS5rZ9iwoscNdT5mMwUd0C51v/fSlzItg==
+ dependencies:
+ "@jest/source-map" "^24.3.0"
+ chalk "^2.0.1"
+ slash "^2.0.0"
-array-equal@^1.0.0:
- version "1.0.0"
- resolved "http://registry.npm.taobao.org/array-equal/download/array-equal-1.0.0.tgz#8c2a5ef2472fd9ea742b04c77a75093ba2757c93"
+"@jest/core@^24.8.0":
+ version "24.8.0"
+ resolved "https://registry.yarnpkg.com/@jest/core/-/core-24.8.0.tgz#fbbdcd42a41d0d39cddbc9f520c8bab0c33eed5b"
+ integrity sha512-R9rhAJwCBQzaRnrRgAdVfnglUuATXdwTRsYqs6NMdVcAl5euG8LtWDe+fVkN27YfKVBW61IojVsXKaOmSnqd/A==
+ dependencies:
+ "@jest/console" "^24.7.1"
+ "@jest/reporters" "^24.8.0"
+ "@jest/test-result" "^24.8.0"
+ "@jest/transform" "^24.8.0"
+ "@jest/types" "^24.8.0"
+ ansi-escapes "^3.0.0"
+ chalk "^2.0.1"
+ exit "^0.1.2"
+ graceful-fs "^4.1.15"
+ jest-changed-files "^24.8.0"
+ jest-config "^24.8.0"
+ jest-haste-map "^24.8.0"
+ jest-message-util "^24.8.0"
+ jest-regex-util "^24.3.0"
+ jest-resolve-dependencies "^24.8.0"
+ jest-runner "^24.8.0"
+ jest-runtime "^24.8.0"
+ jest-snapshot "^24.8.0"
+ jest-util "^24.8.0"
+ jest-validate "^24.8.0"
+ jest-watcher "^24.8.0"
+ micromatch "^3.1.10"
+ p-each-series "^1.0.0"
+ pirates "^4.0.1"
+ realpath-native "^1.1.0"
+ rimraf "^2.5.4"
+ strip-ansi "^5.0.0"
+
+"@jest/environment@^24.8.0":
+ version "24.8.0"
+ resolved "https://registry.yarnpkg.com/@jest/environment/-/environment-24.8.0.tgz#0342261383c776bdd652168f68065ef144af0eac"
+ integrity sha512-vlGt2HLg7qM+vtBrSkjDxk9K0YtRBi7HfRFaDxoRtyi+DyVChzhF20duvpdAnKVBV6W5tym8jm0U9EfXbDk1tw==
+ dependencies:
+ "@jest/fake-timers" "^24.8.0"
+ "@jest/transform" "^24.8.0"
+ "@jest/types" "^24.8.0"
+ jest-mock "^24.8.0"
+
+"@jest/fake-timers@^24.8.0":
+ version "24.8.0"
+ resolved "https://registry.yarnpkg.com/@jest/fake-timers/-/fake-timers-24.8.0.tgz#2e5b80a4f78f284bcb4bd5714b8e10dd36a8d3d1"
+ integrity sha512-2M4d5MufVXwi6VzZhJ9f5S/wU4ud2ck0kxPof1Iz3zWx6Y+V2eJrES9jEktB6O3o/oEyk+il/uNu9PvASjWXQw==
+ dependencies:
+ "@jest/types" "^24.8.0"
+ jest-message-util "^24.8.0"
+ jest-mock "^24.8.0"
+
+"@jest/reporters@^24.8.0":
+ version "24.8.0"
+ resolved "https://registry.yarnpkg.com/@jest/reporters/-/reporters-24.8.0.tgz#075169cd029bddec54b8f2c0fc489fd0b9e05729"
+ integrity sha512-eZ9TyUYpyIIXfYCrw0UHUWUvE35vx5I92HGMgS93Pv7du+GHIzl+/vh8Qj9MCWFK/4TqyttVBPakWMOfZRIfxw==
+ dependencies:
+ "@jest/environment" "^24.8.0"
+ "@jest/test-result" "^24.8.0"
+ "@jest/transform" "^24.8.0"
+ "@jest/types" "^24.8.0"
+ chalk "^2.0.1"
+ exit "^0.1.2"
+ glob "^7.1.2"
+ istanbul-lib-coverage "^2.0.2"
+ istanbul-lib-instrument "^3.0.1"
+ istanbul-lib-report "^2.0.4"
+ istanbul-lib-source-maps "^3.0.1"
+ istanbul-reports "^2.1.1"
+ jest-haste-map "^24.8.0"
+ jest-resolve "^24.8.0"
+ jest-runtime "^24.8.0"
+ jest-util "^24.8.0"
+ jest-worker "^24.6.0"
+ node-notifier "^5.2.1"
+ slash "^2.0.0"
+ source-map "^0.6.0"
+ string-length "^2.0.0"
-array-filter@~0.0.0:
- version "0.0.1"
- resolved "http://registry.npm.taobao.org/array-filter/download/array-filter-0.0.1.tgz#7da8cf2e26628ed732803581fd21f67cacd2eeec"
+"@jest/source-map@^24.3.0":
+ version "24.3.0"
+ resolved "https://registry.yarnpkg.com/@jest/source-map/-/source-map-24.3.0.tgz#563be3aa4d224caf65ff77edc95cd1ca4da67f28"
+ integrity sha512-zALZt1t2ou8le/crCeeiRYzvdnTzaIlpOWaet45lNSqNJUnXbppUUFR4ZUAlzgDmKee4Q5P/tKXypI1RiHwgag==
+ dependencies:
+ callsites "^3.0.0"
+ graceful-fs "^4.1.15"
+ source-map "^0.6.0"
-array-find-index@^1.0.1:
- version "1.0.2"
- resolved "http://registry.npm.taobao.org/array-find-index/download/array-find-index-1.0.2.tgz#df010aa1287e164bbda6f9723b0a96a1ec4187a1"
+"@jest/test-result@^24.8.0":
+ version "24.8.0"
+ resolved "https://registry.yarnpkg.com/@jest/test-result/-/test-result-24.8.0.tgz#7675d0aaf9d2484caa65e048d9b467d160f8e9d3"
+ integrity sha512-+YdLlxwizlfqkFDh7Mc7ONPQAhA4YylU1s529vVM1rsf67vGZH/2GGm5uO8QzPeVyaVMobCQ7FTxl38QrKRlng==
+ dependencies:
+ "@jest/console" "^24.7.1"
+ "@jest/types" "^24.8.0"
+ "@types/istanbul-lib-coverage" "^2.0.0"
+
+"@jest/test-sequencer@^24.8.0":
+ version "24.8.0"
+ resolved "https://registry.yarnpkg.com/@jest/test-sequencer/-/test-sequencer-24.8.0.tgz#2f993bcf6ef5eb4e65e8233a95a3320248cf994b"
+ integrity sha512-OzL/2yHyPdCHXEzhoBuq37CE99nkme15eHkAzXRVqthreWZamEMA0WoetwstsQBCXABhczpK03JNbc4L01vvLg==
+ dependencies:
+ "@jest/test-result" "^24.8.0"
+ jest-haste-map "^24.8.0"
+ jest-runner "^24.8.0"
+ jest-runtime "^24.8.0"
+
+"@jest/transform@^24.8.0":
+ version "24.8.0"
+ resolved "https://registry.yarnpkg.com/@jest/transform/-/transform-24.8.0.tgz#628fb99dce4f9d254c6fd9341e3eea262e06fef5"
+ integrity sha512-xBMfFUP7TortCs0O+Xtez2W7Zu1PLH9bvJgtraN1CDST6LBM/eTOZ9SfwS/lvV8yOfcDpFmwf9bq5cYbXvqsvA==
+ dependencies:
+ "@babel/core" "^7.1.0"
+ "@jest/types" "^24.8.0"
+ babel-plugin-istanbul "^5.1.0"
+ chalk "^2.0.1"
+ convert-source-map "^1.4.0"
+ fast-json-stable-stringify "^2.0.0"
+ graceful-fs "^4.1.15"
+ jest-haste-map "^24.8.0"
+ jest-regex-util "^24.3.0"
+ jest-util "^24.8.0"
+ micromatch "^3.1.10"
+ realpath-native "^1.1.0"
+ slash "^2.0.0"
+ source-map "^0.6.1"
+ write-file-atomic "2.4.1"
[email protected]:
- version "1.1.1"
- resolved "http://registry.npm.taobao.org/array-flatten/download/array-flatten-1.1.1.tgz#9a5f699051b1e7073328f2a008968b64ea2955d2"
+"@jest/types@^24.8.0":
+ version "24.8.0"
+ resolved "https://registry.yarnpkg.com/@jest/types/-/types-24.8.0.tgz#f31e25948c58f0abd8c845ae26fcea1491dea7ad"
+ integrity sha512-g17UxVr2YfBtaMUxn9u/4+siG1ptg9IGYAYwvpwn61nBg779RXnjE/m7CxYcIzEt0AbHZZAHSEZNhkE2WxURVg==
+ dependencies:
+ "@types/istanbul-lib-coverage" "^2.0.0"
+ "@types/istanbul-reports" "^1.1.1"
+ "@types/yargs" "^12.0.9"
-array-flatten@^2.1.0:
+"@marionebl/sander@^0.6.0":
+ version "0.6.1"
+ resolved "https://registry.yarnpkg.com/@marionebl/sander/-/sander-0.6.1.tgz#1958965874f24bc51be48875feb50d642fc41f7b"
+ integrity sha1-GViWWHTyS8Ub5Ih1/rUNZC/EH3s=
+ dependencies:
+ graceful-fs "^4.1.3"
+ mkdirp "^0.5.1"
+ rimraf "^2.5.2"
+
+"@neutrinojs/[email protected]":
+ version "9.0.0-rc.3"
+ resolved "https://registry.yarnpkg.com/@neutrinojs/clean/-/clean-9.0.0-rc.3.tgz#983e3ee36e89b154092c5da525fa99dcca4bb6ca"
+ integrity sha512-AY8vqcPPqjIFrHO55o0yvoIJdfhnRLVdDAHp63B0ZbBbsSrsWE7nVrKsiXLbtJ5aGrYZHFqmdx1m7MxjTRVrTQ==
+ dependencies:
+ clean-webpack-plugin "^2.0.1"
+
+"@neutrinojs/[email protected]":
+ version "9.0.0-rc.3"
+ resolved "https://registry.yarnpkg.com/@neutrinojs/compile-loader/-/compile-loader-9.0.0-rc.3.tgz#89d255e045d2568c27028f93a0ecb93d2e700424"
+ integrity sha512-gkRPKrQnu3HORp75cDxGZ4Rhnmw+Ga8p+LIwX0yXtEvg2X3ie4OOnmsQJd1eFSs2W8oA7HbEJ6Yu8xlioktEKA==
+ dependencies:
+ "@babel/core" "^7.4.3"
+ babel-loader "^8.0.5"
+
+"@neutrinojs/copy@^8.3.0":
+ version "8.3.0"
+ resolved "https://registry.yarnpkg.com/@neutrinojs/copy/-/copy-8.3.0.tgz#d41a7124b677103134063ef1a4f2a671da1b7758"
+ integrity sha1-1BpxJLZ3EDE0Bj7xpPKmcdobd1g=
+ dependencies:
+ copy-webpack-plugin "^4.5.1"
+ deepmerge "^1.5.2"
+
+"@neutrinojs/[email protected]":
+ version "9.0.0-rc.3"
+ resolved "https://registry.yarnpkg.com/@neutrinojs/dev-server/-/dev-server-9.0.0-rc.3.tgz#5a56489113b8af9d13c5ff50dec5469b041a0999"
+ integrity sha512-vIp2tdH0z82SId8ptJ9JHk8KaYHHid+G4pWKK37As928w6JdUQFU13PBN22jlFmuos22Lvr9lJe0HIj32gALcw==
+
+"@neutrinojs/[email protected]":
+ version "9.0.0-rc.3"
+ resolved "https://registry.yarnpkg.com/@neutrinojs/font-loader/-/font-loader-9.0.0-rc.3.tgz#c61cc6357efc708988bfe4b5c8215da05252d75e"
+ integrity sha512-d3ajbs7FaxpRVgkegOtgQkesIB7SrSC9vjhaDLhKfRCV/1zGWksC1uDpN+fZZONWm0nvdQ4R69atDGMs0lErow==
+ dependencies:
+ file-loader "^3.0.1"
+
+"@neutrinojs/[email protected]":
+ version "9.0.0-rc.3"
+ resolved "https://registry.yarnpkg.com/@neutrinojs/html-loader/-/html-loader-9.0.0-rc.3.tgz#f3f47e12917f23c03c92c28cc5988f2b85468229"
+ integrity sha512-IuxW56uCCU28e6bAIfLgTapb5OJdweeYa4fmISi9OvtPdvFTJOfQfaxcYmFUG6H8HU8ZcV+ep2YSfHhoU1h0wA==
+ dependencies:
+ html-loader "^0.5.5"
+
+"@neutrinojs/[email protected]":
+ version "9.0.0-rc.3"
+ resolved "https://registry.yarnpkg.com/@neutrinojs/html-template/-/html-template-9.0.0-rc.3.tgz#bc72cc3195e84335f6efe4a787b9abab7b886a18"
+ integrity sha512-gQhKe1VvPt+Igzxg9NYan9uVsB27j3ybkH68DKiUCRKlLEssbumqmpVwWNt/SOBWEYumuB3WjZj2OaAG/6JQbQ==
+ dependencies:
+ html-webpack-plugin "4.0.0-beta.5"
+
+"@neutrinojs/[email protected]":
+ version "9.0.0-rc.3"
+ resolved "https://registry.yarnpkg.com/@neutrinojs/image-loader/-/image-loader-9.0.0-rc.3.tgz#697c36ad743d131a5312105ff8ce227583f4b63e"
+ integrity sha512-q08YiSrhJyLWaOe8CE1vcyOtWI83NzsyxTczqdKtN0mQodUXjwx3zeo5mdopl5XiWIzlJpRHIgDYy24TxVR9NA==
+ dependencies:
+ file-loader "^3.0.1"
+ url-loader "^1.1.2"
+
+"@neutrinojs/react@^9.0.0-rc.3":
+ version "9.0.0-rc.3"
+ resolved "https://registry.yarnpkg.com/@neutrinojs/react/-/react-9.0.0-rc.3.tgz#1e368df4463bd50909d48be025bbcdaa160336b0"
+ integrity sha512-fmbm7o1Do/3DBSJ0r4nQQMWSEXyd/sM/O6Y1V/Kn/oCx9lCMO62UXEEqVTGw8jeb/DpIbYvZnRmL0IOhfldQ1A==
+ dependencies:
+ "@babel/core" "^7.4.3"
+ "@babel/plugin-proposal-class-properties" "^7.4.0"
+ "@babel/preset-react" "^7.0.0"
+ "@neutrinojs/web" "9.0.0-rc.3"
+ babel-merge "^3.0.0"
+ babel-plugin-transform-react-remove-prop-types "^0.4.24"
+ deepmerge "^1.5.2"
+ eslint-plugin-react "^7.12.4"
+ eslint-plugin-react-hooks "^1.6.0"
+
+"@neutrinojs/[email protected]":
+ version "9.0.0-rc.3"
+ resolved "https://registry.yarnpkg.com/@neutrinojs/style-loader/-/style-loader-9.0.0-rc.3.tgz#ec065d96ae5485035c13da1da3c5fa6c7ce278e5"
+ integrity sha512-AawIvSN0Z/IbCwWICHvb7inqmDoO4S8VAI8ZFT6uUmW8knZ7mydi1GjXc/xwvgrfQyFmgKgss4aIrYXFnmrv2w==
+ dependencies:
+ css-loader "^2.1.1"
+ deepmerge "^1.5.2"
+ mini-css-extract-plugin "^0.6.0"
+ style-loader "^0.23.1"
+
+"@neutrinojs/[email protected]":
+ version "9.0.0-rc.3"
+ resolved "https://registry.yarnpkg.com/@neutrinojs/web/-/web-9.0.0-rc.3.tgz#37404c521956dff852b326104d5e1921af05bf36"
+ integrity sha512-YjxHibjo+MuNDgLiw3MTEjRCHTxnD2obsYMO1wfVG3h5DKHvrBGVuv+KHltX3MRRkkZzKOVM0WuGsuw2ZoTzHw==
+ dependencies:
+ "@babel/core" "^7.4.3"
+ "@babel/plugin-syntax-dynamic-import" "^7.2.0"
+ "@babel/preset-env" "^7.4.3"
+ "@neutrinojs/clean" "9.0.0-rc.3"
+ "@neutrinojs/compile-loader" "9.0.0-rc.3"
+ "@neutrinojs/dev-server" "9.0.0-rc.3"
+ "@neutrinojs/font-loader" "9.0.0-rc.3"
+ "@neutrinojs/html-loader" "9.0.0-rc.3"
+ "@neutrinojs/html-template" "9.0.0-rc.3"
+ "@neutrinojs/image-loader" "9.0.0-rc.3"
+ "@neutrinojs/style-loader" "9.0.0-rc.3"
+ babel-merge "^3.0.0"
+ deepmerge "^1.5.2"
+
+"@nodelib/[email protected]":
version "2.1.1"
- resolved "http://registry.npm.taobao.org/array-flatten/download/array-flatten-2.1.1.tgz#426bb9da84090c1838d812c8150af20a8331e296"
+ resolved "https://registry.yarnpkg.com/@nodelib/fs.scandir/-/fs.scandir-2.1.1.tgz#7fa8fed654939e1a39753d286b48b4836d00e0eb"
+ integrity sha512-NT/skIZjgotDSiXs0WqYhgcuBKhUMgfekCmCGtkUAiLqZdOnrdjmZr9wRl3ll64J9NF79uZ4fk16Dx0yMc/Xbg==
+ dependencies:
+ "@nodelib/fs.stat" "2.0.1"
+ run-parallel "^1.1.9"
-array-ify@^1.0.0:
- version "1.0.0"
- resolved "http://registry.npm.taobao.org/array-ify/download/array-ify-1.0.0.tgz#9e528762b4a9066ad163a6962a364418e9626ece"
+"@nodelib/[email protected]", "@nodelib/fs.stat@^2.0.1":
+ version "2.0.1"
+ resolved "https://registry.yarnpkg.com/@nodelib/fs.stat/-/fs.stat-2.0.1.tgz#814f71b1167390cfcb6a6b3d9cdeb0951a192c14"
+ integrity sha512-+RqhBlLn6YRBGOIoVYthsG0J9dfpO79eJyN7BYBkZJtfqrBwf2KK+rD/M/yjZR6WBmIhAgOV7S60eCgaSWtbFw==
-array-includes@^3.0.3:
- version "3.0.3"
- resolved "http://registry.npm.taobao.org/array-includes/download/array-includes-3.0.3.tgz#184b48f62d92d7452bb31b323165c7f8bd02266d"
+"@nodelib/fs.walk@^1.2.1":
+ version "1.2.2"
+ resolved "https://registry.yarnpkg.com/@nodelib/fs.walk/-/fs.walk-1.2.2.tgz#6a6450c5e17012abd81450eb74949a4d970d2807"
+ integrity sha512-J/DR3+W12uCzAJkw7niXDcqcKBg6+5G5Q/ZpThpGNzAUz70eOR6RV4XnnSN01qHZiVl0eavoxJsBypQoKsV2QQ==
dependencies:
- define-properties "^1.1.2"
- es-abstract "^1.7.0"
+ "@nodelib/fs.scandir" "2.1.1"
+ fastq "^1.6.0"
-array-map@~0.0.0:
- version "0.0.0"
- resolved "http://registry.npm.taobao.org/array-map/download/array-map-0.0.0.tgz#88a2bab73d1cf7bcd5c1b118a003f66f665fa662"
+"@sinonjs/commons@^1", "@sinonjs/commons@^1.0.2", "@sinonjs/commons@^1.4.0":
+ version "1.4.0"
+ resolved "https://registry.yarnpkg.com/@sinonjs/commons/-/commons-1.4.0.tgz#7b3ec2d96af481d7a0321252e7b1c94724ec5a78"
+ integrity sha512-9jHK3YF/8HtJ9wCAbG+j8cD0i0+ATS9A7gXFqS36TblLPNy6rEEc+SB0imo91eCboGaBYGV/MT1/br/J+EE7Tw==
+ dependencies:
+ type-detect "4.0.8"
-array-reduce@~0.0.0:
- version "0.0.0"
- resolved "http://registry.npm.taobao.org/array-reduce/download/array-reduce-0.0.0.tgz#173899d3ffd1c7d9383e4479525dbe278cab5f2b"
+"@sinonjs/formatio@^3.1.0", "@sinonjs/formatio@^3.2.1":
+ version "3.2.1"
+ resolved "https://registry.yarnpkg.com/@sinonjs/formatio/-/formatio-3.2.1.tgz#52310f2f9bcbc67bdac18c94ad4901b95fde267e"
+ integrity sha512-tsHvOB24rvyvV2+zKMmPkZ7dXX6LSLKZ7aOtXY6Edklp0uRcgGpOsQTTGTcWViFyx4uhWc6GV8QdnALbIbIdeQ==
+ dependencies:
+ "@sinonjs/commons" "^1"
+ "@sinonjs/samsam" "^3.1.0"
-array-tree-filter@^1.0.0:
- version "1.0.1"
- resolved "http://registry.npm.taobao.org/array-tree-filter/download/array-tree-filter-1.0.1.tgz#0a8ad1eefd38ce88858632f9cc0423d7634e4d5d"
- integrity sha1-CorR7v04zoiFhjL5zAQj12NOTV0=
+"@sinonjs/samsam@^3.1.0", "@sinonjs/samsam@^3.3.1":
+ version "3.3.2"
+ resolved "https://registry.yarnpkg.com/@sinonjs/samsam/-/samsam-3.3.2.tgz#63942e3d5eb0b79f6de3bef9abfad15fb4b6401b"
+ integrity sha512-ILO/rR8LfAb60Y1Yfp9vxfYAASK43NFC2mLzpvLUbCQY/Qu8YwReboseu8aheCEkyElZF2L2T9mHcR2bgdvZyA==
+ dependencies:
+ "@sinonjs/commons" "^1.0.2"
+ array-from "^2.1.1"
+ lodash "^4.17.11"
-array-tree-filter@^2.0.0:
- version "2.1.0"
- resolved "http://registry.npm.taobao.org/array-tree-filter/download/array-tree-filter-2.1.0.tgz#873ac00fec83749f255ac8dd083814b4f6329190"
- integrity sha1-hzrAD+yDdJ8lWsjdCDgUtPYykZA=
+"@sinonjs/text-encoding@^0.7.1":
+ version "0.7.1"
+ resolved "https://registry.yarnpkg.com/@sinonjs/text-encoding/-/text-encoding-0.7.1.tgz#8da5c6530915653f3a1f38fd5f101d8c3f8079c5"
+ integrity sha512-+iTbntw2IZPb/anVDbypzfQa+ay64MW0Zo8aJ8gZPWMMK6/OubMVb6lUPMagqjOPnmtauXnFCACVl3O7ogjeqQ==
-array-union@^1.0.1:
- version "1.0.2"
- resolved "http://registry.npm.taobao.org/array-union/download/array-union-1.0.2.tgz#9a34410e4f4e3da23dea375be5be70f24778ec39"
+"@types/babel__core@^7.1.0":
+ version "7.1.2"
+ resolved "https://registry.yarnpkg.com/@types/babel__core/-/babel__core-7.1.2.tgz#608c74f55928033fce18b99b213c16be4b3d114f"
+ integrity sha512-cfCCrFmiGY/yq0NuKNxIQvZFy9kY/1immpSpTngOnyIbD4+eJOG5mxphhHDv3CHL9GltO4GcKr54kGBg3RNdbg==
dependencies:
- array-uniq "^1.0.1"
-
-array-uniq@^1.0.1:
- version "1.0.3"
- resolved "http://registry.npm.taobao.org/array-uniq/download/array-uniq-1.0.3.tgz#af6ac877a25cc7f74e058894753858dfdb24fdb6"
+ "@babel/parser" "^7.1.0"
+ "@babel/types" "^7.0.0"
+ "@types/babel__generator" "*"
+ "@types/babel__template" "*"
+ "@types/babel__traverse" "*"
-array-unique@^0.2.1:
- version "0.2.1"
- resolved "http://registry.npm.taobao.org/array-unique/download/array-unique-0.2.1.tgz#a1d97ccafcbc2625cc70fadceb36a50c58b01a53"
+"@types/babel__generator@*":
+ version "7.0.2"
+ resolved "https://registry.yarnpkg.com/@types/babel__generator/-/babel__generator-7.0.2.tgz#d2112a6b21fad600d7674274293c85dce0cb47fc"
+ integrity sha512-NHcOfab3Zw4q5sEE2COkpfXjoE7o+PmqD9DQW4koUT3roNxwziUdXGnRndMat/LJNUtePwn1TlP4do3uoe3KZQ==
+ dependencies:
+ "@babel/types" "^7.0.0"
-array-unique@^0.3.2:
- version "0.3.2"
- resolved "http://registry.npm.taobao.org/array-unique/download/array-unique-0.3.2.tgz#a894b75d4bc4f6cd679ef3244a9fd8f46ae2d428"
+"@types/babel__template@*":
+ version "7.0.2"
+ resolved "https://registry.yarnpkg.com/@types/babel__template/-/babel__template-7.0.2.tgz#4ff63d6b52eddac1de7b975a5223ed32ecea9307"
+ integrity sha512-/K6zCpeW7Imzgab2bLkLEbz0+1JlFSrUMdw7KoIIu+IUdu51GWaBZpd3y1VXGVXzynvGa4DaIaxNZHiON3GXUg==
+ dependencies:
+ "@babel/parser" "^7.1.0"
+ "@babel/types" "^7.0.0"
-arrify@^1.0.1:
- version "1.0.1"
- resolved "http://registry.npm.taobao.org/arrify/download/arrify-1.0.1.tgz#898508da2226f380df904728456849c1501a4b0d"
+"@types/babel__traverse@*", "@types/babel__traverse@^7.0.6":
+ version "7.0.7"
+ resolved "https://registry.yarnpkg.com/@types/babel__traverse/-/babel__traverse-7.0.7.tgz#2496e9ff56196cc1429c72034e07eab6121b6f3f"
+ integrity sha512-CeBpmX1J8kWLcDEnI3Cl2Eo6RfbGvzUctA+CjZUhOKDFbLfcr7fc4usEqLNWetrlJd7RhAkyYe2czXop4fICpw==
+ dependencies:
+ "@babel/types" "^7.3.0"
-asap@~2.0.3:
- version "2.0.6"
- resolved "http://registry.npm.taobao.org/asap/download/asap-2.0.6.tgz#e50347611d7e690943208bbdafebcbc2fb866d46"
+"@types/events@*":
+ version "3.0.0"
+ resolved "https://registry.yarnpkg.com/@types/events/-/events-3.0.0.tgz#2862f3f58a9a7f7c3e78d79f130dd4d71c25c2a7"
+ integrity sha512-EaObqwIvayI5a8dCzhFrjKzVwKLxjoG9T6Ppd5CEo07LRKfQ8Yokw54r5+Wq7FaBQ+yXRvQAYPrHwya1/UFt9g==
-asn1.js@^4.0.0:
- version "4.10.1"
- resolved "http://registry.npm.taobao.org/asn1.js/download/asn1.js-4.10.1.tgz#b9c2bf5805f1e64aadeed6df3a2bfafb5a73f5a0"
+"@types/glob@^7.1.1":
+ version "7.1.1"
+ resolved "https://registry.yarnpkg.com/@types/glob/-/glob-7.1.1.tgz#aa59a1c6e3fbc421e07ccd31a944c30eba521575"
+ integrity sha512-1Bh06cbWJUHMC97acuD6UMG29nMt0Aqz1vF3guLfG+kHHJhy3AyohZFFxYk2f7Q1SQIrNwvncxAE0N/9s70F2w==
dependencies:
- bn.js "^4.0.0"
- inherits "^2.0.1"
- minimalistic-assert "^1.0.0"
-
-asn1@~0.2.3:
- version "0.2.3"
- resolved "http://registry.npm.taobao.org/asn1/download/asn1-0.2.3.tgz#dac8787713c9966849fc8180777ebe9c1ddf3b86"
+ "@types/events" "*"
+ "@types/minimatch" "*"
+ "@types/node" "*"
[email protected], assert-plus@^1.0.0:
- version "1.0.0"
- resolved "http://registry.npm.taobao.org/assert-plus/download/assert-plus-1.0.0.tgz#f12e0f3c5d77b0b1cdd9146942e4e96c1e4dd525"
+"@types/istanbul-lib-coverage@*", "@types/istanbul-lib-coverage@^2.0.0":
+ version "2.0.1"
+ resolved "https://registry.yarnpkg.com/@types/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.1.tgz#42995b446db9a48a11a07ec083499a860e9138ff"
+ integrity sha512-hRJD2ahnnpLgsj6KWMYSrmXkM3rm2Dl1qkx6IOFD5FnuNPXJIG5L0dhgKXCYTRMGzU4n0wImQ/xfmRc4POUFlg==
-assert-plus@^0.2.0:
- version "0.2.0"
- resolved "http://registry.npm.taobao.org/assert-plus/download/assert-plus-0.2.0.tgz#d74e1b87e7affc0db8aadb7021f3fe48101ab234"
+"@types/istanbul-lib-report@*":
+ version "1.1.1"
+ resolved "https://registry.yarnpkg.com/@types/istanbul-lib-report/-/istanbul-lib-report-1.1.1.tgz#e5471e7fa33c61358dd38426189c037a58433b8c"
+ integrity sha512-3BUTyMzbZa2DtDI2BkERNC6jJw2Mr2Y0oGI7mRxYNBPxppbtEK1F66u3bKwU2g+wxwWI7PAoRpJnOY1grJqzHg==
+ dependencies:
+ "@types/istanbul-lib-coverage" "*"
-assert@^1.1.1:
- version "1.4.1"
- resolved "http://registry.npm.taobao.org/assert/download/assert-1.4.1.tgz#99912d591836b5a6f5b345c0f07eefc08fc65d91"
+"@types/istanbul-reports@^1.1.1":
+ version "1.1.1"
+ resolved "https://registry.yarnpkg.com/@types/istanbul-reports/-/istanbul-reports-1.1.1.tgz#7a8cbf6a406f36c8add871625b278eaf0b0d255a"
+ integrity sha512-UpYjBi8xefVChsCoBpKShdxTllC9pwISirfoZsUa2AAdQg/Jd2KQGtSbw+ya7GPo7x/wAPlH6JBhKhAsXUEZNA==
dependencies:
- util "0.10.3"
+ "@types/istanbul-lib-coverage" "*"
+ "@types/istanbul-lib-report" "*"
-assign-symbols@^1.0.0:
- version "1.0.0"
- resolved "http://registry.npm.taobao.org/assign-symbols/download/assign-symbols-1.0.0.tgz#59667f41fadd4f20ccbc2bb96b8d4f7f78ec0367"
+"@types/minimatch@*":
+ version "3.0.3"
+ resolved "https://registry.yarnpkg.com/@types/minimatch/-/minimatch-3.0.3.tgz#3dca0e3f33b200fc7d1139c0cd96c1268cadfd9d"
+ integrity sha512-tHq6qdbT9U1IRSGf14CL0pUlULksvY9OZ+5eEgl1N7t+OA3tGvNpxJCzuKQlsNgCVwbAs670L1vcVQi8j9HjnA==
-astral-regex@^1.0.0:
- version "1.0.0"
- resolved "http://registry.npm.taobao.org/astral-regex/download/astral-regex-1.0.0.tgz#6c8c3fb827dd43ee3918f27b82782ab7658a6fd9"
+"@types/node@*":
+ version "12.0.12"
+ resolved "https://registry.yarnpkg.com/@types/node/-/node-12.0.12.tgz#cc791b402360db1eaf7176479072f91ee6c6c7ca"
+ integrity sha512-Uy0PN4R5vgBUXFoJrKryf5aTk3kJ8Rv3PdlHjl6UaX+Cqp1QE0yPQ68MPXGrZOfG7gZVNDIJZYyot0B9ubXUrQ==
-async-each@^1.0.0:
- version "1.0.1"
- resolved "http://registry.npm.taobao.org/async-each/download/async-each-1.0.1.tgz#19d386a1d9edc6e7c1c85d388aedbcc56d33602d"
+"@types/normalize-package-data@^2.4.0":
+ version "2.4.0"
+ resolved "https://registry.yarnpkg.com/@types/normalize-package-data/-/normalize-package-data-2.4.0.tgz#e486d0d97396d79beedd0a6e33f4534ff6b4973e"
+ integrity sha512-f5j5b/Gf71L+dbqxIpQ4Z2WlmI/mPJ0fOkGGmFgtb6sAu97EPczzbS3/tJKxmcYDj55OX6ssqwDAWOHIYDRDGA==
-async-foreach@^0.1.3:
- version "0.1.3"
- resolved "http://registry.npm.taobao.org/async-foreach/download/async-foreach-0.1.3.tgz#36121f845c0578172de419a97dbeb1d16ec34542"
+"@types/stack-utils@^1.0.1":
+ version "1.0.1"
+ resolved "https://registry.yarnpkg.com/@types/stack-utils/-/stack-utils-1.0.1.tgz#0a851d3bd96498fa25c33ab7278ed3bd65f06c3e"
+ integrity sha512-l42BggppR6zLmpfU6fq9HEa2oGPEI8yrSPL3GITjfRInppYFahObbIQOQK3UGxEnyQpltZLaPe75046NOZQikw==
-async-limiter@~1.0.0:
- version "1.0.0"
- resolved "http://registry.npm.taobao.org/async-limiter/download/async-limiter-1.0.0.tgz#78faed8c3d074ab81f22b4e985d79e8738f720f8"
+"@types/yargs@^12.0.2", "@types/yargs@^12.0.9":
+ version "12.0.12"
+ resolved "https://registry.yarnpkg.com/@types/yargs/-/yargs-12.0.12.tgz#45dd1d0638e8c8f153e87d296907659296873916"
+ integrity sha512-SOhuU4wNBxhhTHxYaiG5NY4HBhDIDnJF60GU+2LqHAdKKer86//e4yg69aENCtQ04n0ovz+tq2YPME5t5yp4pw==
-async-validator@~1.8.5:
- version "1.8.5"
- resolved "http://registry.npm.taobao.org/async-validator/download/async-validator-1.8.5.tgz#dc3e08ec1fd0dddb67e60842f02c0cd1cec6d7f0"
- integrity sha1-3D4I7B/Q3dtn5ghC8CwM0c7G1/A=
+"@typescript-eslint/eslint-plugin@^1.11.0":
+ version "1.11.0"
+ resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-1.11.0.tgz#870f752c520db04db6d3668af7479026a6f2fb9a"
+ integrity sha512-mXv9ccCou89C8/4avKHuPB2WkSZyY/XcTQUXd5LFZAcLw1I3mWYVjUu6eS9Ja0QkP/ClolbcW9tb3Ov/pMdcqw==
dependencies:
- babel-runtime "6.x"
-
-async@^1.4.0, async@^1.5.2:
- version "1.5.2"
- resolved "http://registry.npm.taobao.org/async/download/async-1.5.2.tgz#ec6a61ae56480c0c3cb241c95618e20892f9672a"
+ "@typescript-eslint/experimental-utils" "1.11.0"
+ eslint-utils "^1.3.1"
+ functional-red-black-tree "^1.0.1"
+ regexpp "^2.0.1"
+ tsutils "^3.7.0"
-async@^2.0.0, async@^2.1.2, async@^2.1.4, async@^2.4.1:
- version "2.6.1"
- resolved "http://registry.npm.taobao.org/async/download/async-2.6.1.tgz#b245a23ca71930044ec53fa46aa00a3e87c6a610"
+"@typescript-eslint/[email protected]":
+ version "1.11.0"
+ resolved "https://registry.yarnpkg.com/@typescript-eslint/experimental-utils/-/experimental-utils-1.11.0.tgz#594abe47091cbeabac1d6f9cfed06d0ad99eb7e3"
+ integrity sha512-7LbfaqF6B8oa8cp/315zxKk8FFzosRzzhF8Kn/ZRsRsnpm7Qcu25cR/9RnAQo5utZ2KIWVgaALr+ZmcbG47ruw==
dependencies:
- lodash "^4.17.10"
+ "@typescript-eslint/typescript-estree" "1.11.0"
+ eslint-scope "^4.0.0"
-asynckit@^0.4.0:
- version "0.4.0"
- resolved "http://registry.npm.taobao.org/asynckit/download/asynckit-0.4.0.tgz#c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79"
+"@typescript-eslint/[email protected]":
+ version "1.11.0"
+ resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-1.11.0.tgz#b7b5782aab22e4b3b6d84633652c9f41e62d37d5"
+ integrity sha512-fquUHF5tAx1sM2OeRCC7wVxFd1iMELWMGCzOSmJ3pLzArj9+kRixdlC4d5MncuzXpjEqc6045p3KwM0o/3FuUA==
+ dependencies:
+ lodash.unescape "4.0.1"
+ semver "5.5.0"
-atob@^2.1.1:
- version "2.1.1"
- resolved "http://registry.npm.taobao.org/atob/download/atob-2.1.1.tgz#ae2d5a729477f289d60dd7f96a6314a22dd6c22a"
+"@webassemblyjs/[email protected]":
+ version "1.8.5"
+ resolved "https://registry.yarnpkg.com/@webassemblyjs/ast/-/ast-1.8.5.tgz#51b1c5fe6576a34953bf4b253df9f0d490d9e359"
+ integrity sha512-aJMfngIZ65+t71C3y2nBBg5FFG0Okt9m0XEgWZ7Ywgn1oMAT8cNwx00Uv1cQyHtidq0Xn94R4TAywO+LCQ+ZAQ==
+ dependencies:
+ "@webassemblyjs/helper-module-context" "1.8.5"
+ "@webassemblyjs/helper-wasm-bytecode" "1.8.5"
+ "@webassemblyjs/wast-parser" "1.8.5"
[email protected]:
- version "8.1.0"
- resolved "http://registry.npm.taobao.org/autoprefixer/download/autoprefixer-8.1.0.tgz#374cf35be1c0e8fce97408d876f95f66f5cb4641"
- dependencies:
- browserslist "^3.1.1"
- caniuse-lite "^1.0.30000810"
- normalize-range "^0.1.2"
- num2fraction "^1.2.2"
- postcss "^6.0.19"
- postcss-value-parser "^3.2.3"
-
-autoprefixer@^6.3.1:
- version "6.7.7"
- resolved "http://registry.npm.taobao.org/autoprefixer/download/autoprefixer-6.7.7.tgz#1dbd1c835658e35ce3f9984099db00585c782014"
- dependencies:
- browserslist "^1.7.6"
- caniuse-db "^1.0.30000634"
- normalize-range "^0.1.2"
- num2fraction "^1.2.2"
- postcss "^5.2.16"
- postcss-value-parser "^3.2.3"
-
-aws-sign2@~0.6.0:
- version "0.6.0"
- resolved "http://registry.npm.taobao.org/aws-sign2/download/aws-sign2-0.6.0.tgz#14342dd38dbcc94d0e5b87d763cd63612c0e794f"
+"@webassemblyjs/[email protected]":
+ version "1.8.5"
+ resolved "https://registry.yarnpkg.com/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.8.5.tgz#1ba926a2923613edce496fd5b02e8ce8a5f49721"
+ integrity sha512-9p+79WHru1oqBh9ewP9zW95E3XAo+90oth7S5Re3eQnECGq59ly1Ri5tsIipKGpiStHsUYmY3zMLqtk3gTcOtQ==
-aws-sign2@~0.7.0:
- version "0.7.0"
- resolved "http://registry.npm.taobao.org/aws-sign2/download/aws-sign2-0.7.0.tgz#b46e890934a9591f2d2f6f86d7e6a9f1b3fe76a8"
+"@webassemblyjs/[email protected]":
+ version "1.8.5"
+ resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-api-error/-/helper-api-error-1.8.5.tgz#c49dad22f645227c5edb610bdb9697f1aab721f7"
+ integrity sha512-Za/tnzsvnqdaSPOUXHyKJ2XI7PDX64kWtURyGiJJZKVEdFOsdKUCPTNEVFZq3zJ2R0G5wc2PZ5gvdTRFgm81zA==
-aws4@^1.2.1, aws4@^1.6.0:
- version "1.7.0"
- resolved "http://registry.npm.taobao.org/aws4/download/aws4-1.7.0.tgz#d4d0e9b9dbfca77bf08eeb0a8a471550fe39e289"
+"@webassemblyjs/[email protected]":
+ version "1.8.5"
+ resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-buffer/-/helper-buffer-1.8.5.tgz#fea93e429863dd5e4338555f42292385a653f204"
+ integrity sha512-Ri2R8nOS0U6G49Q86goFIPNgjyl6+oE1abW1pS84BuhP1Qcr5JqMwRFT3Ah3ADDDYGEgGs1iyb1DGX+kAi/c/Q==
[email protected], babel-code-frame@^6.20.0, babel-code-frame@^6.22.0, babel-code-frame@^6.26.0:
- version "6.26.0"
- resolved "http://registry.npm.taobao.org/babel-code-frame/download/babel-code-frame-6.26.0.tgz#63fd43f7dc1e3bb7ce35947db8fe369a3f58c74b"
+"@webassemblyjs/[email protected]":
+ version "1.8.5"
+ resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-code-frame/-/helper-code-frame-1.8.5.tgz#9a740ff48e3faa3022b1dff54423df9aa293c25e"
+ integrity sha512-VQAadSubZIhNpH46IR3yWO4kZZjMxN1opDrzePLdVKAZ+DFjkGD/rf4v1jap744uPVU6yjL/smZbRIIJTOUnKQ==
dependencies:
- chalk "^1.1.3"
- esutils "^2.0.2"
- js-tokens "^3.0.2"
+ "@webassemblyjs/wast-printer" "1.8.5"
[email protected]:
- version "6.26.0"
- resolved "http://registry.npm.taobao.org/babel-core/download/babel-core-6.26.0.tgz#af32f78b31a6fcef119c87b0fd8d9753f03a0bb8"
- dependencies:
- babel-code-frame "^6.26.0"
- babel-generator "^6.26.0"
- babel-helpers "^6.24.1"
- babel-messages "^6.23.0"
- babel-register "^6.26.0"
- babel-runtime "^6.26.0"
- babel-template "^6.26.0"
- babel-traverse "^6.26.0"
- babel-types "^6.26.0"
- babylon "^6.18.0"
- convert-source-map "^1.5.0"
- debug "^2.6.8"
- json5 "^0.5.1"
- lodash "^4.17.4"
- minimatch "^3.0.4"
- path-is-absolute "^1.0.1"
- private "^0.1.7"
- slash "^1.0.0"
- source-map "^0.5.6"
+"@webassemblyjs/[email protected]":
+ version "1.8.5"
+ resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-fsm/-/helper-fsm-1.8.5.tgz#ba0b7d3b3f7e4733da6059c9332275d860702452"
+ integrity sha512-kRuX/saORcg8se/ft6Q2UbRpZwP4y7YrWsLXPbbmtepKr22i8Z4O3V5QE9DbZK908dh5Xya4Un57SDIKwB9eow==
-babel-core@^6.0.0, babel-core@^6.26.0, babel-core@^6.26.3:
- version "6.26.3"
- resolved "http://registry.npm.taobao.org/babel-core/download/babel-core-6.26.3.tgz#b2e2f09e342d0f0c88e2f02e067794125e75c207"
+"@webassemblyjs/[email protected]":
+ version "1.8.5"
+ resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-module-context/-/helper-module-context-1.8.5.tgz#def4b9927b0101dc8cbbd8d1edb5b7b9c82eb245"
+ integrity sha512-/O1B236mN7UNEU4t9X7Pj38i4VoU8CcMHyy3l2cV/kIF4U5KoHXDVqcDuOs1ltkac90IM4vZdHc52t1x8Yfs3g==
dependencies:
- babel-code-frame "^6.26.0"
- babel-generator "^6.26.0"
- babel-helpers "^6.24.1"
- babel-messages "^6.23.0"
- babel-register "^6.26.0"
- babel-runtime "^6.26.0"
- babel-template "^6.26.0"
- babel-traverse "^6.26.0"
- babel-types "^6.26.0"
- babylon "^6.18.0"
- convert-source-map "^1.5.1"
- debug "^2.6.9"
- json5 "^0.5.1"
- lodash "^4.17.4"
- minimatch "^3.0.4"
- path-is-absolute "^1.0.1"
- private "^0.1.8"
- slash "^1.0.0"
- source-map "^0.5.7"
+ "@webassemblyjs/ast" "1.8.5"
+ mamacro "^0.0.3"
-babel-generator@^6.18.0, babel-generator@^6.26.0:
- version "6.26.1"
- resolved "http://registry.npm.taobao.org/babel-generator/download/babel-generator-6.26.1.tgz#1844408d3b8f0d35a404ea7ac180f087a601bd90"
- dependencies:
- babel-messages "^6.23.0"
- babel-runtime "^6.26.0"
- babel-types "^6.26.0"
- detect-indent "^4.0.0"
- jsesc "^1.3.0"
- lodash "^4.17.4"
- source-map "^0.5.7"
- trim-right "^1.0.1"
+"@webassemblyjs/[email protected]":
+ version "1.8.5"
+ resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.8.5.tgz#537a750eddf5c1e932f3744206551c91c1b93e61"
+ integrity sha512-Cu4YMYG3Ddl72CbmpjU/wbP6SACcOPVbHN1dI4VJNJVgFwaKf1ppeFJrwydOG3NDHxVGuCfPlLZNyEdIYlQ6QQ==
-babel-helper-builder-binary-assignment-operator-visitor@^6.24.1:
- version "6.24.1"
- resolved "http://registry.npm.taobao.org/babel-helper-builder-binary-assignment-operator-visitor/download/babel-helper-builder-binary-assignment-operator-visitor-6.24.1.tgz#cce4517ada356f4220bcae8a02c2b346f9a56664"
+"@webassemblyjs/[email protected]":
+ version "1.8.5"
+ resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.8.5.tgz#74ca6a6bcbe19e50a3b6b462847e69503e6bfcbf"
+ integrity sha512-VV083zwR+VTrIWWtgIUpqfvVdK4ff38loRmrdDBgBT8ADXYsEZ5mPQ4Nde90N3UYatHdYoDIFb7oHzMncI02tA==
dependencies:
- babel-helper-explode-assignable-expression "^6.24.1"
- babel-runtime "^6.22.0"
- babel-types "^6.24.1"
+ "@webassemblyjs/ast" "1.8.5"
+ "@webassemblyjs/helper-buffer" "1.8.5"
+ "@webassemblyjs/helper-wasm-bytecode" "1.8.5"
+ "@webassemblyjs/wasm-gen" "1.8.5"
-babel-helper-builder-react-jsx@^6.24.1:
- version "6.26.0"
- resolved "http://registry.npm.taobao.org/babel-helper-builder-react-jsx/download/babel-helper-builder-react-jsx-6.26.0.tgz#39ff8313b75c8b65dceff1f31d383e0ff2a408a0"
+"@webassemblyjs/[email protected]":
+ version "1.8.5"
+ resolved "https://registry.yarnpkg.com/@webassemblyjs/ieee754/-/ieee754-1.8.5.tgz#712329dbef240f36bf57bd2f7b8fb9bf4154421e"
+ integrity sha512-aaCvQYrvKbY/n6wKHb/ylAJr27GglahUO89CcGXMItrOBqRarUMxWLJgxm9PJNuKULwN5n1csT9bYoMeZOGF3g==
dependencies:
- babel-runtime "^6.26.0"
- babel-types "^6.26.0"
- esutils "^2.0.2"
+ "@xtuc/ieee754" "^1.2.0"
-babel-helper-call-delegate@^6.24.1:
- version "6.24.1"
- resolved "http://registry.npm.taobao.org/babel-helper-call-delegate/download/babel-helper-call-delegate-6.24.1.tgz#ece6aacddc76e41c3461f88bfc575bd0daa2df8d"
+"@webassemblyjs/[email protected]":
+ version "1.8.5"
+ resolved "https://registry.yarnpkg.com/@webassemblyjs/leb128/-/leb128-1.8.5.tgz#044edeb34ea679f3e04cd4fd9824d5e35767ae10"
+ integrity sha512-plYUuUwleLIziknvlP8VpTgO4kqNaH57Y3JnNa6DLpu/sGcP6hbVdfdX5aHAV716pQBKrfuU26BJK29qY37J7A==
dependencies:
- babel-helper-hoist-variables "^6.24.1"
- babel-runtime "^6.22.0"
- babel-traverse "^6.24.1"
- babel-types "^6.24.1"
+ "@xtuc/long" "4.2.2"
-babel-helper-define-map@^6.24.1:
- version "6.26.0"
- resolved "http://registry.npm.taobao.org/babel-helper-define-map/download/babel-helper-define-map-6.26.0.tgz#a5f56dab41a25f97ecb498c7ebaca9819f95be5f"
- dependencies:
- babel-helper-function-name "^6.24.1"
- babel-runtime "^6.26.0"
- babel-types "^6.26.0"
- lodash "^4.17.4"
+"@webassemblyjs/[email protected]":
+ version "1.8.5"
+ resolved "https://registry.yarnpkg.com/@webassemblyjs/utf8/-/utf8-1.8.5.tgz#a8bf3b5d8ffe986c7c1e373ccbdc2a0915f0cedc"
+ integrity sha512-U7zgftmQriw37tfD934UNInokz6yTmn29inT2cAetAsaU9YeVCveWEwhKL1Mg4yS7q//NGdzy79nlXh3bT8Kjw==
-babel-helper-explode-assignable-expression@^6.24.1:
- version "6.24.1"
- resolved "http://registry.npm.taobao.org/babel-helper-explode-assignable-expression/download/babel-helper-explode-assignable-expression-6.24.1.tgz#f25b82cf7dc10433c55f70592d5746400ac22caa"
+"@webassemblyjs/[email protected]":
+ version "1.8.5"
+ resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-edit/-/wasm-edit-1.8.5.tgz#962da12aa5acc1c131c81c4232991c82ce56e01a"
+ integrity sha512-A41EMy8MWw5yvqj7MQzkDjU29K7UJq1VrX2vWLzfpRHt3ISftOXqrtojn7nlPsZ9Ijhp5NwuODuycSvfAO/26Q==
+ dependencies:
+ "@webassemblyjs/ast" "1.8.5"
+ "@webassemblyjs/helper-buffer" "1.8.5"
+ "@webassemblyjs/helper-wasm-bytecode" "1.8.5"
+ "@webassemblyjs/helper-wasm-section" "1.8.5"
+ "@webassemblyjs/wasm-gen" "1.8.5"
+ "@webassemblyjs/wasm-opt" "1.8.5"
+ "@webassemblyjs/wasm-parser" "1.8.5"
+ "@webassemblyjs/wast-printer" "1.8.5"
+
+"@webassemblyjs/[email protected]":
+ version "1.8.5"
+ resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-gen/-/wasm-gen-1.8.5.tgz#54840766c2c1002eb64ed1abe720aded714f98bc"
+ integrity sha512-BCZBT0LURC0CXDzj5FXSc2FPTsxwp3nWcqXQdOZE4U7h7i8FqtFK5Egia6f9raQLpEKT1VL7zr4r3+QX6zArWg==
dependencies:
- babel-runtime "^6.22.0"
- babel-traverse "^6.24.1"
- babel-types "^6.24.1"
+ "@webassemblyjs/ast" "1.8.5"
+ "@webassemblyjs/helper-wasm-bytecode" "1.8.5"
+ "@webassemblyjs/ieee754" "1.8.5"
+ "@webassemblyjs/leb128" "1.8.5"
+ "@webassemblyjs/utf8" "1.8.5"
-babel-helper-function-name@^6.24.1:
- version "6.24.1"
- resolved "http://registry.npm.taobao.org/babel-helper-function-name/download/babel-helper-function-name-6.24.1.tgz#d3475b8c03ed98242a25b48351ab18399d3580a9"
+"@webassemblyjs/[email protected]":
+ version "1.8.5"
+ resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-opt/-/wasm-opt-1.8.5.tgz#b24d9f6ba50394af1349f510afa8ffcb8a63d264"
+ integrity sha512-HKo2mO/Uh9A6ojzu7cjslGaHaUU14LdLbGEKqTR7PBKwT6LdPtLLh9fPY33rmr5wcOMrsWDbbdCHq4hQUdd37Q==
dependencies:
- babel-helper-get-function-arity "^6.24.1"
- babel-runtime "^6.22.0"
- babel-template "^6.24.1"
- babel-traverse "^6.24.1"
- babel-types "^6.24.1"
+ "@webassemblyjs/ast" "1.8.5"
+ "@webassemblyjs/helper-buffer" "1.8.5"
+ "@webassemblyjs/wasm-gen" "1.8.5"
+ "@webassemblyjs/wasm-parser" "1.8.5"
-babel-helper-get-function-arity@^6.24.1:
- version "6.24.1"
- resolved "http://registry.npm.taobao.org/babel-helper-get-function-arity/download/babel-helper-get-function-arity-6.24.1.tgz#8f7782aa93407c41d3aa50908f89b031b1b6853d"
+"@webassemblyjs/[email protected]":
+ version "1.8.5"
+ resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-parser/-/wasm-parser-1.8.5.tgz#21576f0ec88b91427357b8536383668ef7c66b8d"
+ integrity sha512-pi0SYE9T6tfcMkthwcgCpL0cM9nRYr6/6fjgDtL6q/ZqKHdMWvxitRi5JcZ7RI4SNJJYnYNaWy5UUrHQy998lw==
dependencies:
- babel-runtime "^6.22.0"
- babel-types "^6.24.1"
+ "@webassemblyjs/ast" "1.8.5"
+ "@webassemblyjs/helper-api-error" "1.8.5"
+ "@webassemblyjs/helper-wasm-bytecode" "1.8.5"
+ "@webassemblyjs/ieee754" "1.8.5"
+ "@webassemblyjs/leb128" "1.8.5"
+ "@webassemblyjs/utf8" "1.8.5"
-babel-helper-hoist-variables@^6.24.1:
- version "6.24.1"
- resolved "http://registry.npm.taobao.org/babel-helper-hoist-variables/download/babel-helper-hoist-variables-6.24.1.tgz#1ecb27689c9d25513eadbc9914a73f5408be7a76"
+"@webassemblyjs/[email protected]":
+ version "1.8.5"
+ resolved "https://registry.yarnpkg.com/@webassemblyjs/wast-parser/-/wast-parser-1.8.5.tgz#e10eecd542d0e7bd394f6827c49f3df6d4eefb8c"
+ integrity sha512-daXC1FyKWHF1i11obK086QRlsMsY4+tIOKgBqI1lxAnkp9xe9YMcgOxm9kLe+ttjs5aWV2KKE1TWJCN57/Btsg==
dependencies:
- babel-runtime "^6.22.0"
- babel-types "^6.24.1"
+ "@webassemblyjs/ast" "1.8.5"
+ "@webassemblyjs/floating-point-hex-parser" "1.8.5"
+ "@webassemblyjs/helper-api-error" "1.8.5"
+ "@webassemblyjs/helper-code-frame" "1.8.5"
+ "@webassemblyjs/helper-fsm" "1.8.5"
+ "@xtuc/long" "4.2.2"
-babel-helper-module-imports@^7.0.0-beta.3:
- version "7.0.0-beta.3"
- resolved "http://registry.npm.taobao.org/babel-helper-module-imports/download/babel-helper-module-imports-7.0.0-beta.3.tgz#e15764e3af9c8e11810c09f78f498a2bdc71585a"
+"@webassemblyjs/[email protected]":
+ version "1.8.5"
+ resolved "https://registry.yarnpkg.com/@webassemblyjs/wast-printer/-/wast-printer-1.8.5.tgz#114bbc481fd10ca0e23b3560fa812748b0bae5bc"
+ integrity sha512-w0U0pD4EhlnvRyeJzBqaVSJAo9w/ce7/WPogeXLzGkO6hzhr4GnQIZ4W4uUt5b9ooAaXPtnXlj0gzsXEOUNYMg==
dependencies:
- babel-types "7.0.0-beta.3"
- lodash "^4.2.0"
+ "@webassemblyjs/ast" "1.8.5"
+ "@webassemblyjs/wast-parser" "1.8.5"
+ "@xtuc/long" "4.2.2"
-babel-helper-optimise-call-expression@^6.24.1:
- version "6.24.1"
- resolved "http://registry.npm.taobao.org/babel-helper-optimise-call-expression/download/babel-helper-optimise-call-expression-6.24.1.tgz#f7a13427ba9f73f8f4fa993c54a97882d1244257"
- dependencies:
- babel-runtime "^6.22.0"
- babel-types "^6.24.1"
+"@xtuc/ieee754@^1.2.0":
+ version "1.2.0"
+ resolved "https://registry.yarnpkg.com/@xtuc/ieee754/-/ieee754-1.2.0.tgz#eef014a3145ae477a1cbc00cd1e552336dceb790"
+ integrity sha512-DX8nKgqcGwsc0eJSqYt5lwP4DH5FlHnmuWWBRy7X0NcaGR0ZtuyeESgMwTYVEtxmsNGY+qit4QYT/MIYTOTPeA==
-babel-helper-regex@^6.24.1:
- version "6.26.0"
- resolved "http://registry.npm.taobao.org/babel-helper-regex/download/babel-helper-regex-6.26.0.tgz#325c59f902f82f24b74faceed0363954f6495e72"
+"@xtuc/[email protected]":
+ version "4.2.2"
+ resolved "https://registry.yarnpkg.com/@xtuc/long/-/long-4.2.2.tgz#d291c6a4e97989b5c61d9acf396ae4fe133a718d"
+ integrity sha512-NuHqBY1PB/D8xU6s/thBgOAiAP7HOYDQ32+BFZILJ8ivkUkAHQnWfn6WhL79Owj1qmUnoN/YPhktdIoucipkAQ==
+
+JSONStream@^1.0.4:
+ version "1.3.5"
+ resolved "https://registry.yarnpkg.com/JSONStream/-/JSONStream-1.3.5.tgz#3208c1f08d3a4d99261ab64f92302bc15e111ca0"
+ integrity sha512-E+iruNOY8VV9s4JEbe1aNEm6MiszPRr/UfcHMz0TQh1BXSxHK+ASV1R6W4HpjBhSeS+54PIsAMCBmwD06LLsqQ==
dependencies:
- babel-runtime "^6.26.0"
- babel-types "^6.26.0"
- lodash "^4.17.4"
+ jsonparse "^1.2.0"
+ through ">=2.2.7 <3"
-babel-helper-remap-async-to-generator@^6.24.1:
- version "6.24.1"
- resolved "http://registry.npm.taobao.org/babel-helper-remap-async-to-generator/download/babel-helper-remap-async-to-generator-6.24.1.tgz#5ec581827ad723fecdd381f1c928390676e4551b"
- dependencies:
- babel-helper-function-name "^6.24.1"
- babel-runtime "^6.22.0"
- babel-template "^6.24.1"
- babel-traverse "^6.24.1"
- babel-types "^6.24.1"
+abab@^2.0.0:
+ version "2.0.0"
+ resolved "https://registry.yarnpkg.com/abab/-/abab-2.0.0.tgz#aba0ab4c5eee2d4c79d3487d85450fb2376ebb0f"
+ integrity sha512-sY5AXXVZv4Y1VACTtR11UJCPHHudgY5i26Qj5TypE6DKlIApbwb5uqhXcJ5UUGbvZNRh7EeIoW+LrJumBsKp7w==
-babel-helper-replace-supers@^6.24.1:
- version "6.24.1"
- resolved "http://registry.npm.taobao.org/babel-helper-replace-supers/download/babel-helper-replace-supers-6.24.1.tgz#bf6dbfe43938d17369a213ca8a8bf74b6a90ab1a"
- dependencies:
- babel-helper-optimise-call-expression "^6.24.1"
- babel-messages "^6.23.0"
- babel-runtime "^6.22.0"
- babel-template "^6.24.1"
- babel-traverse "^6.24.1"
- babel-types "^6.24.1"
+abbrev@1:
+ version "1.1.1"
+ resolved "https://registry.yarnpkg.com/abbrev/-/abbrev-1.1.1.tgz#f8f2c887ad10bf67f634f005b6987fed3179aac8"
+ integrity sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q==
-babel-helpers@^6.24.1:
- version "6.24.1"
- resolved "http://registry.npm.taobao.org/babel-helpers/download/babel-helpers-6.24.1.tgz#3471de9caec388e5c850e597e58a26ddf37602b2"
+accepts@~1.3.4, accepts@~1.3.5, accepts@~1.3.7:
+ version "1.3.7"
+ resolved "https://registry.yarnpkg.com/accepts/-/accepts-1.3.7.tgz#531bc726517a3b2b41f850021c6cc15eaab507cd"
+ integrity sha512-Il80Qs2WjYlJIBNzNkK6KYqlVMTbZLXgHx2oT0pU/fjRHyEp+PEfEPY0R3WCwAGVOtauxh1hOxNgIf5bv7dQpA==
dependencies:
- babel-runtime "^6.22.0"
- babel-template "^6.24.1"
+ mime-types "~2.1.24"
+ negotiator "0.6.2"
[email protected]:
- version "22.4.1"
- resolved "http://registry.npm.taobao.org/babel-jest/download/babel-jest-22.4.1.tgz#ff53ebca45957347f27ff4666a31499fbb4c4ddd"
- dependencies:
- babel-plugin-istanbul "^4.1.5"
- babel-preset-jest "^22.4.1"
+acorn-dynamic-import@^4.0.0:
+ version "4.0.0"
+ resolved "https://registry.yarnpkg.com/acorn-dynamic-import/-/acorn-dynamic-import-4.0.0.tgz#482210140582a36b83c3e342e1cfebcaa9240948"
+ integrity sha512-d3OEjQV4ROpoflsnUA8HozoIR504TFxNivYEUi6uwz0IYhBkTDXGuWlNdMtybRt3nqVx/L6XqMt0FxkXuWKZhw==
-babel-jest@^22.4.4:
- version "22.4.4"
- resolved "http://registry.npm.taobao.org/babel-jest/download/babel-jest-22.4.4.tgz#977259240420e227444ebe49e226a61e49ea659d"
+acorn-globals@^4.1.0:
+ version "4.3.2"
+ resolved "https://registry.yarnpkg.com/acorn-globals/-/acorn-globals-4.3.2.tgz#4e2c2313a597fd589720395f6354b41cd5ec8006"
+ integrity sha512-BbzvZhVtZP+Bs1J1HcwrQe8ycfO0wStkSGxuul3He3GkHOIZ6eTqOkPuw9IP1X3+IkOo4wiJmwkobzXYz4wewQ==
dependencies:
- babel-plugin-istanbul "^4.1.5"
- babel-preset-jest "^22.4.4"
+ acorn "^6.0.1"
+ acorn-walk "^6.0.1"
[email protected]:
- version "7.1.4"
- resolved "http://registry.npm.taobao.org/babel-loader/download/babel-loader-7.1.4.tgz#e3463938bd4e6d55d1c174c5485d406a188ed015"
- dependencies:
- find-cache-dir "^1.0.0"
- loader-utils "^1.0.2"
- mkdirp "^0.5.1"
+acorn-jsx@^5.0.0:
+ version "5.0.1"
+ resolved "https://registry.yarnpkg.com/acorn-jsx/-/acorn-jsx-5.0.1.tgz#32a064fd925429216a09b141102bfdd185fae40e"
+ integrity sha512-HJ7CfNHrfJLlNTzIEUTj43LNWGkqpRLxm3YjAlcD0ACydk9XynzYsCBHxut+iqt+1aBXkx9UP/w/ZqMr13XIzg==
-babel-messages@^6.23.0:
- version "6.23.0"
- resolved "http://registry.npm.taobao.org/babel-messages/download/babel-messages-6.23.0.tgz#f3cdf4703858035b2a2951c6ec5edf6c62f2630e"
- dependencies:
- babel-runtime "^6.22.0"
+acorn-walk@^6.0.1:
+ version "6.2.0"
+ resolved "https://registry.yarnpkg.com/acorn-walk/-/acorn-walk-6.2.0.tgz#123cb8f3b84c2171f1f7fb252615b1c78a6b1a8c"
+ integrity sha512-7evsyfH1cLOCdAzZAd43Cic04yKydNx0cF+7tiA19p1XnLLPU4dpCQOqpjqwokFe//vS0QqfqqjCS2JkiIs0cA==
-babel-plugin-check-es2015-constants@^6.22.0:
- version "6.22.0"
- resolved "http://registry.npm.taobao.org/babel-plugin-check-es2015-constants/download/babel-plugin-check-es2015-constants-6.22.0.tgz#35157b101426fd2ffd3da3f75c7d1e91835bbf8a"
- dependencies:
- babel-runtime "^6.22.0"
+acorn@^5.5.3:
+ version "5.7.3"
+ resolved "https://registry.yarnpkg.com/acorn/-/acorn-5.7.3.tgz#67aa231bf8812974b85235a96771eb6bd07ea279"
+ integrity sha512-T/zvzYRfbVojPWahDsE5evJdHb3oJoQfFbsrKM7w5Zcs++Tr257tia3BmMP8XYVjp1S9RZXQMh7gao96BlqZOw==
-babel-plugin-istanbul@^4.1.5, babel-plugin-istanbul@^4.1.6:
- version "4.1.6"
- resolved "http://registry.npm.taobao.org/babel-plugin-istanbul/download/babel-plugin-istanbul-4.1.6.tgz#36c59b2192efce81c5b378321b74175add1c9a45"
- dependencies:
- babel-plugin-syntax-object-rest-spread "^6.13.0"
- find-up "^2.1.0"
- istanbul-lib-instrument "^1.10.1"
- test-exclude "^4.2.1"
+acorn@^6.0.1, acorn@^6.0.5, acorn@^6.0.7:
+ version "6.2.0"
+ resolved "https://registry.yarnpkg.com/acorn/-/acorn-6.2.0.tgz#67f0da2fc339d6cfb5d6fb244fd449f33cd8bbe3"
+ integrity sha512-8oe72N3WPMjA+2zVG71Ia0nXZ8DpQH+QyyHO+p06jT8eg8FGG3FbcUIi8KziHlAfheJQZeoqbvq1mQSQHXKYLw==
-babel-plugin-jest-hoist@^22.4.4:
- version "22.4.4"
- resolved "http://registry.npm.taobao.org/babel-plugin-jest-hoist/download/babel-plugin-jest-hoist-22.4.4.tgz#b9851906eab34c7bf6f8c895a2b08bea1a844c0b"
+ajv-errors@^1.0.0:
+ version "1.0.1"
+ resolved "https://registry.yarnpkg.com/ajv-errors/-/ajv-errors-1.0.1.tgz#f35986aceb91afadec4102fbd85014950cefa64d"
+ integrity sha512-DCRfO/4nQ+89p/RK43i8Ezd41EqdGIU4ld7nGF8OQ14oc/we5rEntLCUa7+jrn3nn83BosfwZA0wb4pon2o8iQ==
-babel-plugin-lodash@^3.3.2:
- version "3.3.2"
- resolved "http://registry.npm.taobao.org/babel-plugin-lodash/download/babel-plugin-lodash-3.3.2.tgz#da3a5b49ba27447f54463f6c4fa81396ccdd463f"
+ajv-keywords@^3.1.0:
+ version "3.4.0"
+ resolved "https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-3.4.0.tgz#4b831e7b531415a7cc518cd404e73f6193c6349d"
+ integrity sha512-aUjdRFISbuFOl0EIZc+9e4FfZp0bDZgAdOOf30bJmw8VM9v84SHyVyxDfbWxpGYbdZD/9XoKxfHVNmxPkhwyGw==
+
+ajv@^6.1.0, ajv@^6.10.0, ajv@^6.5.5, ajv@^6.9.1:
+ version "6.10.0"
+ resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.10.0.tgz#90d0d54439da587cd7e843bfb7045f50bd22bdf1"
+ integrity sha512-nffhOpkymDECQyR0mnsUtoCE8RlX38G0rYP+wgLWFyZuUyuuojSSvi/+euOiQBIn63whYwYVIIH1TvE3tu4OEg==
dependencies:
- babel-helper-module-imports "^7.0.0-beta.3"
- babel-types "^6.26.0"
- glob "^7.1.1"
- lodash "^4.17.4"
- require-package-name "^2.0.1"
+ fast-deep-equal "^2.0.1"
+ fast-json-stable-stringify "^2.0.0"
+ json-schema-traverse "^0.4.1"
+ uri-js "^4.2.2"
-babel-plugin-syntax-async-functions@^6.8.0:
- version "6.13.0"
- resolved "http://registry.npm.taobao.org/babel-plugin-syntax-async-functions/download/babel-plugin-syntax-async-functions-6.13.0.tgz#cad9cad1191b5ad634bf30ae0872391e0647be95"
+ansi-colors@^3.0.0:
+ version "3.2.4"
+ resolved "https://registry.yarnpkg.com/ansi-colors/-/ansi-colors-3.2.4.tgz#e3a3da4bfbae6c86a9c285625de124a234026fbf"
+ integrity sha512-hHUXGagefjN2iRrID63xckIvotOXOojhQKWIPUZ4mNUZ9nLZW+7FMNoE1lOkEhNWYsx/7ysGIuJYCiMAA9FnrA==
-babel-plugin-syntax-exponentiation-operator@^6.8.0:
- version "6.13.0"
- resolved "http://registry.npm.taobao.org/babel-plugin-syntax-exponentiation-operator/download/babel-plugin-syntax-exponentiation-operator-6.13.0.tgz#9ee7e8337290da95288201a6a57f4170317830de"
+ansi-escapes@^3.0.0, ansi-escapes@^3.2.0:
+ version "3.2.0"
+ resolved "https://registry.yarnpkg.com/ansi-escapes/-/ansi-escapes-3.2.0.tgz#8780b98ff9dbf5638152d1f1fe5c1d7b4442976b"
+ integrity sha512-cBhpre4ma+U0T1oM5fXg7Dy1Jw7zzwv7lt/GoCpr+hDQJoYnKVPLL4dCvSEFMmQurOQvSrwT7SL/DAlhBI97RQ==
-babel-plugin-syntax-flow@^6.18.0:
- version "6.18.0"
- resolved "http://registry.npm.taobao.org/babel-plugin-syntax-flow/download/babel-plugin-syntax-flow-6.18.0.tgz#4c3ab20a2af26aa20cd25995c398c4eb70310c8d"
[email protected]:
+ version "0.0.7"
+ resolved "https://registry.yarnpkg.com/ansi-html/-/ansi-html-0.0.7.tgz#813584021962a9e9e6fd039f940d12f56ca7859e"
+ integrity sha1-gTWEAhliqenm/QOflA0S9WynhZ4=
-babel-plugin-syntax-jsx@^6.3.13, babel-plugin-syntax-jsx@^6.8.0:
- version "6.18.0"
- resolved "http://registry.npm.taobao.org/babel-plugin-syntax-jsx/download/babel-plugin-syntax-jsx-6.18.0.tgz#0af32a9a6e13ca7a3fd5069e62d7b0f58d0d8946"
+ansi-regex@^2.0.0:
+ version "2.1.1"
+ resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-2.1.1.tgz#c3b33ab5ee360d86e0e628f0468ae7ef27d654df"
+ integrity sha1-w7M6te42DYbg5ijwRorn7yfWVN8=
-babel-plugin-syntax-object-rest-spread@^6.13.0, babel-plugin-syntax-object-rest-spread@^6.8.0:
- version "6.13.0"
- resolved "http://registry.npm.taobao.org/babel-plugin-syntax-object-rest-spread/download/babel-plugin-syntax-object-rest-spread-6.13.0.tgz#fd6536f2bce13836ffa3a5458c4903a597bb3bf5"
+ansi-regex@^3.0.0:
+ version "3.0.0"
+ resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-3.0.0.tgz#ed0317c322064f79466c02966bddb605ab37d998"
+ integrity sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=
-babel-plugin-syntax-trailing-function-commas@^6.22.0:
- version "6.22.0"
- resolved "http://registry.npm.taobao.org/babel-plugin-syntax-trailing-function-commas/download/babel-plugin-syntax-trailing-function-commas-6.22.0.tgz#ba0360937f8d06e40180a43fe0d5616fff532cf3"
+ansi-regex@^4.0.0, ansi-regex@^4.1.0:
+ version "4.1.0"
+ resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-4.1.0.tgz#8b9f8f08cf1acb843756a839ca8c7e3168c51997"
+ integrity sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==
-babel-plugin-transform-async-to-generator@^6.22.0:
- version "6.24.1"
- resolved "http://registry.npm.taobao.org/babel-plugin-transform-async-to-generator/download/babel-plugin-transform-async-to-generator-6.24.1.tgz#6536e378aff6cb1d5517ac0e40eb3e9fc8d08761"
+ansi-styles@^3.2.0, ansi-styles@^3.2.1:
+ version "3.2.1"
+ resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-3.2.1.tgz#41fbb20243e50b12be0f04b8dedbf07520ce841d"
+ integrity sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==
dependencies:
- babel-helper-remap-async-to-generator "^6.24.1"
- babel-plugin-syntax-async-functions "^6.8.0"
- babel-runtime "^6.22.0"
+ color-convert "^1.9.0"
-babel-plugin-transform-es2015-arrow-functions@^6.22.0:
- version "6.22.0"
- resolved "http://registry.npm.taobao.org/babel-plugin-transform-es2015-arrow-functions/download/babel-plugin-transform-es2015-arrow-functions-6.22.0.tgz#452692cb711d5f79dc7f85e440ce41b9f244d221"
+anymatch@^2.0.0:
+ version "2.0.0"
+ resolved "https://registry.yarnpkg.com/anymatch/-/anymatch-2.0.0.tgz#bcb24b4f37934d9aa7ac17b4adaf89e7c76ef2eb"
+ integrity sha512-5teOsQWABXHHBFP9y3skS5P3d/WfWXpv3FUpy+LorMrNYaT9pI4oLMQX7jzQ2KklNpGpWHzdCXTDT2Y3XGlZBw==
dependencies:
- babel-runtime "^6.22.0"
+ micromatch "^3.1.4"
+ normalize-path "^2.1.1"
-babel-plugin-transform-es2015-block-scoped-functions@^6.22.0:
- version "6.22.0"
- resolved "http://registry.npm.taobao.org/babel-plugin-transform-es2015-block-scoped-functions/download/babel-plugin-transform-es2015-block-scoped-functions-6.22.0.tgz#bbc51b49f964d70cb8d8e0b94e820246ce3a6141"
- dependencies:
- babel-runtime "^6.22.0"
+aproba@^1.0.3, aproba@^1.1.1:
+ version "1.2.0"
+ resolved "https://registry.yarnpkg.com/aproba/-/aproba-1.2.0.tgz#6802e6264efd18c790a1b0d517f0f2627bf2c94a"
+ integrity sha512-Y9J6ZjXtoYh8RnXVCMOU/ttDmk1aBjunq9vO0ta5x85WDQiQfUF9sIPBITdbiiIVcBo03Hi3jMxigBtsddlXRw==
-babel-plugin-transform-es2015-block-scoping@^6.23.0:
- version "6.26.0"
- resolved "http://registry.npm.taobao.org/babel-plugin-transform-es2015-block-scoping/download/babel-plugin-transform-es2015-block-scoping-6.26.0.tgz#d70f5299c1308d05c12f463813b0a09e73b1895f"
+archiver-utils@^2.0.0:
+ version "2.0.0"
+ resolved "https://registry.yarnpkg.com/archiver-utils/-/archiver-utils-2.0.0.tgz#5639818a8b5d89d0ffc51b72c39283cf4fea14a1"
+ integrity sha512-JRBgcVvDX4Mwu2RBF8bBaHcQCSxab7afsxAPYDQ5W+19quIPP5CfKE7Ql+UHs9wYvwsaNR8oDuhtf5iqrKmzww==
dependencies:
- babel-runtime "^6.26.0"
- babel-template "^6.26.0"
- babel-traverse "^6.26.0"
- babel-types "^6.26.0"
- lodash "^4.17.4"
+ glob "^7.0.0"
+ graceful-fs "^4.1.0"
+ lazystream "^1.0.0"
+ lodash.assign "^4.2.0"
+ lodash.defaults "^4.2.0"
+ lodash.difference "^4.5.0"
+ lodash.flatten "^4.4.0"
+ lodash.isplainobject "^4.0.6"
+ lodash.toarray "^4.4.0"
+ lodash.union "^4.6.0"
+ normalize-path "^3.0.0"
+ readable-stream "^2.0.0"
-babel-plugin-transform-es2015-classes@^6.23.0:
- version "6.24.1"
- resolved "http://registry.npm.taobao.org/babel-plugin-transform-es2015-classes/download/babel-plugin-transform-es2015-classes-6.24.1.tgz#5a4c58a50c9c9461e564b4b2a3bfabc97a2584db"
+archiver@^3.0.0:
+ version "3.0.0"
+ resolved "https://registry.yarnpkg.com/archiver/-/archiver-3.0.0.tgz#50b2628cf032adcbf35d35d111b5324db95bfb69"
+ integrity sha512-5QeR6Xc5hSA9X1rbQfcuQ6VZuUXOaEdB65Dhmk9duuRJHYif/ZyJfuyJqsQrj34PFjU5emv5/MmfgA8un06onw==
dependencies:
- babel-helper-define-map "^6.24.1"
- babel-helper-function-name "^6.24.1"
- babel-helper-optimise-call-expression "^6.24.1"
- babel-helper-replace-supers "^6.24.1"
- babel-messages "^6.23.0"
- babel-runtime "^6.22.0"
- babel-template "^6.24.1"
- babel-traverse "^6.24.1"
- babel-types "^6.24.1"
+ archiver-utils "^2.0.0"
+ async "^2.0.0"
+ buffer-crc32 "^0.2.1"
+ glob "^7.0.0"
+ readable-stream "^2.0.0"
+ tar-stream "^1.5.0"
+ zip-stream "^2.0.1"
-babel-plugin-transform-es2015-computed-properties@^6.22.0:
- version "6.24.1"
- resolved "http://registry.npm.taobao.org/babel-plugin-transform-es2015-computed-properties/download/babel-plugin-transform-es2015-computed-properties-6.24.1.tgz#6fe2a8d16895d5634f4cd999b6d3480a308159b3"
+are-we-there-yet@~1.1.2:
+ version "1.1.5"
+ resolved "https://registry.yarnpkg.com/are-we-there-yet/-/are-we-there-yet-1.1.5.tgz#4b35c2944f062a8bfcda66410760350fe9ddfc21"
+ integrity sha512-5hYdAkZlcG8tOLujVDTgCT+uPX0VnpAH28gWsLfzpXYm7wP6mp5Q/gYyR7YQ0cKVJcXJnl3j2kpBan13PtQf6w==
dependencies:
- babel-runtime "^6.22.0"
- babel-template "^6.24.1"
+ delegates "^1.0.0"
+ readable-stream "^2.0.6"
-babel-plugin-transform-es2015-destructuring@^6.23.0:
- version "6.23.0"
- resolved "http://registry.npm.taobao.org/babel-plugin-transform-es2015-destructuring/download/babel-plugin-transform-es2015-destructuring-6.23.0.tgz#997bb1f1ab967f682d2b0876fe358d60e765c56d"
+argparse@^1.0.7:
+ version "1.0.10"
+ resolved "https://registry.yarnpkg.com/argparse/-/argparse-1.0.10.tgz#bcd6791ea5ae09725e17e5ad988134cd40b3d911"
+ integrity sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==
dependencies:
- babel-runtime "^6.22.0"
+ sprintf-js "~1.0.2"
-babel-plugin-transform-es2015-duplicate-keys@^6.22.0:
- version "6.24.1"
- resolved "http://registry.npm.taobao.org/babel-plugin-transform-es2015-duplicate-keys/download/babel-plugin-transform-es2015-duplicate-keys-6.24.1.tgz#73eb3d310ca969e3ef9ec91c53741a6f1576423e"
- dependencies:
- babel-runtime "^6.22.0"
- babel-types "^6.24.1"
+arr-diff@^4.0.0:
+ version "4.0.0"
+ resolved "https://registry.yarnpkg.com/arr-diff/-/arr-diff-4.0.0.tgz#d6461074febfec71e7e15235761a329a5dc7c520"
+ integrity sha1-1kYQdP6/7HHn4VI1dhoyml3HxSA=
-babel-plugin-transform-es2015-for-of@^6.23.0:
- version "6.23.0"
- resolved "http://registry.npm.taobao.org/babel-plugin-transform-es2015-for-of/download/babel-plugin-transform-es2015-for-of-6.23.0.tgz#f47c95b2b613df1d3ecc2fdb7573623c75248691"
- dependencies:
- babel-runtime "^6.22.0"
+arr-flatten@^1.1.0:
+ version "1.1.0"
+ resolved "https://registry.yarnpkg.com/arr-flatten/-/arr-flatten-1.1.0.tgz#36048bbff4e7b47e136644316c99669ea5ae91f1"
+ integrity sha512-L3hKV5R/p5o81R7O02IGnwpDmkp6E982XhtbuwSe3O4qOtMMMtodicASA1Cny2U+aCXcNpml+m4dPsvsJ3jatg==
-babel-plugin-transform-es2015-function-name@^6.22.0:
- version "6.24.1"
- resolved "http://registry.npm.taobao.org/babel-plugin-transform-es2015-function-name/download/babel-plugin-transform-es2015-function-name-6.24.1.tgz#834c89853bc36b1af0f3a4c5dbaa94fd8eacaa8b"
- dependencies:
- babel-helper-function-name "^6.24.1"
- babel-runtime "^6.22.0"
- babel-types "^6.24.1"
+arr-union@^3.1.0:
+ version "3.1.0"
+ resolved "https://registry.yarnpkg.com/arr-union/-/arr-union-3.1.0.tgz#e39b09aea9def866a8f206e288af63919bae39c4"
+ integrity sha1-45sJrqne+Gao8gbiiK9jkZuuOcQ=
-babel-plugin-transform-es2015-literals@^6.22.0:
- version "6.22.0"
- resolved "http://registry.npm.taobao.org/babel-plugin-transform-es2015-literals/download/babel-plugin-transform-es2015-literals-6.22.0.tgz#4f54a02d6cd66cf915280019a31d31925377ca2e"
- dependencies:
- babel-runtime "^6.22.0"
+array-equal@^1.0.0:
+ version "1.0.0"
+ resolved "https://registry.yarnpkg.com/array-equal/-/array-equal-1.0.0.tgz#8c2a5ef2472fd9ea742b04c77a75093ba2757c93"
+ integrity sha1-jCpe8kcv2ep0KwTHenUJO6J1fJM=
-babel-plugin-transform-es2015-modules-amd@^6.22.0, babel-plugin-transform-es2015-modules-amd@^6.24.1:
- version "6.24.1"
- resolved "http://registry.npm.taobao.org/babel-plugin-transform-es2015-modules-amd/download/babel-plugin-transform-es2015-modules-amd-6.24.1.tgz#3b3e54017239842d6d19c3011c4bd2f00a00d154"
- dependencies:
- babel-plugin-transform-es2015-modules-commonjs "^6.24.1"
- babel-runtime "^6.22.0"
- babel-template "^6.24.1"
+array-find-index@^1.0.1:
+ version "1.0.2"
+ resolved "https://registry.yarnpkg.com/array-find-index/-/array-find-index-1.0.2.tgz#df010aa1287e164bbda6f9723b0a96a1ec4187a1"
+ integrity sha1-3wEKoSh+Fku9pvlyOwqWoexBh6E=
-babel-plugin-transform-es2015-modules-commonjs@^6.23.0, babel-plugin-transform-es2015-modules-commonjs@^6.24.1, babel-plugin-transform-es2015-modules-commonjs@^6.26.2:
- version "6.26.2"
- resolved "http://registry.npm.taobao.org/babel-plugin-transform-es2015-modules-commonjs/download/babel-plugin-transform-es2015-modules-commonjs-6.26.2.tgz#58a793863a9e7ca870bdc5a881117ffac27db6f3"
- dependencies:
- babel-plugin-transform-strict-mode "^6.24.1"
- babel-runtime "^6.26.0"
- babel-template "^6.26.0"
- babel-types "^6.26.0"
[email protected]:
+ version "1.1.1"
+ resolved "https://registry.yarnpkg.com/array-flatten/-/array-flatten-1.1.1.tgz#9a5f699051b1e7073328f2a008968b64ea2955d2"
+ integrity sha1-ml9pkFGx5wczKPKgCJaLZOopVdI=
-babel-plugin-transform-es2015-modules-systemjs@^6.23.0:
- version "6.24.1"
- resolved "http://registry.npm.taobao.org/babel-plugin-transform-es2015-modules-systemjs/download/babel-plugin-transform-es2015-modules-systemjs-6.24.1.tgz#ff89a142b9119a906195f5f106ecf305d9407d23"
- dependencies:
- babel-helper-hoist-variables "^6.24.1"
- babel-runtime "^6.22.0"
- babel-template "^6.24.1"
+array-flatten@^2.1.0:
+ version "2.1.2"
+ resolved "https://registry.yarnpkg.com/array-flatten/-/array-flatten-2.1.2.tgz#24ef80a28c1a893617e2149b0c6d0d788293b099"
+ integrity sha512-hNfzcOV8W4NdualtqBFPyVO+54DSJuZGY9qT4pRroB6S9e3iiido2ISIC5h9R2sPJ8H3FHCIiEnsv1lPXO3KtQ==
-babel-plugin-transform-es2015-modules-umd@^6.23.0:
- version "6.24.1"
- resolved "http://registry.npm.taobao.org/babel-plugin-transform-es2015-modules-umd/download/babel-plugin-transform-es2015-modules-umd-6.24.1.tgz#ac997e6285cd18ed6176adb607d602344ad38468"
- dependencies:
- babel-plugin-transform-es2015-modules-amd "^6.24.1"
- babel-runtime "^6.22.0"
- babel-template "^6.24.1"
+array-from@^2.1.1:
+ version "2.1.1"
+ resolved "https://registry.yarnpkg.com/array-from/-/array-from-2.1.1.tgz#cfe9d8c26628b9dc5aecc62a9f5d8f1f352c1195"
+ integrity sha1-z+nYwmYoudxa7MYqn12PHzUsEZU=
-babel-plugin-transform-es2015-object-super@^6.22.0:
- version "6.24.1"
- resolved "http://registry.npm.taobao.org/babel-plugin-transform-es2015-object-super/download/babel-plugin-transform-es2015-object-super-6.24.1.tgz#24cef69ae21cb83a7f8603dad021f572eb278f8d"
- dependencies:
- babel-helper-replace-supers "^6.24.1"
- babel-runtime "^6.22.0"
+array-ify@^1.0.0:
+ version "1.0.0"
+ resolved "https://registry.yarnpkg.com/array-ify/-/array-ify-1.0.0.tgz#9e528762b4a9066ad163a6962a364418e9626ece"
+ integrity sha1-nlKHYrSpBmrRY6aWKjZEGOlibs4=
-babel-plugin-transform-es2015-parameters@^6.23.0:
- version "6.24.1"
- resolved "http://registry.npm.taobao.org/babel-plugin-transform-es2015-parameters/download/babel-plugin-transform-es2015-parameters-6.24.1.tgz#57ac351ab49caf14a97cd13b09f66fdf0a625f2b"
+array-includes@^3.0.3:
+ version "3.0.3"
+ resolved "https://registry.yarnpkg.com/array-includes/-/array-includes-3.0.3.tgz#184b48f62d92d7452bb31b323165c7f8bd02266d"
+ integrity sha1-GEtI9i2S10UrsxsyMWXH+L0CJm0=
dependencies:
- babel-helper-call-delegate "^6.24.1"
- babel-helper-get-function-arity "^6.24.1"
- babel-runtime "^6.22.0"
- babel-template "^6.24.1"
- babel-traverse "^6.24.1"
- babel-types "^6.24.1"
+ define-properties "^1.1.2"
+ es-abstract "^1.7.0"
-babel-plugin-transform-es2015-shorthand-properties@^6.22.0:
- version "6.24.1"
- resolved "http://registry.npm.taobao.org/babel-plugin-transform-es2015-shorthand-properties/download/babel-plugin-transform-es2015-shorthand-properties-6.24.1.tgz#24f875d6721c87661bbd99a4622e51f14de38aa0"
+array-union@^1.0.1:
+ version "1.0.2"
+ resolved "https://registry.yarnpkg.com/array-union/-/array-union-1.0.2.tgz#9a34410e4f4e3da23dea375be5be70f24778ec39"
+ integrity sha1-mjRBDk9OPaI96jdb5b5w8kd47Dk=
dependencies:
- babel-runtime "^6.22.0"
- babel-types "^6.24.1"
+ array-uniq "^1.0.1"
-babel-plugin-transform-es2015-spread@^6.22.0:
- version "6.22.0"
- resolved "http://registry.npm.taobao.org/babel-plugin-transform-es2015-spread/download/babel-plugin-transform-es2015-spread-6.22.0.tgz#d6d68a99f89aedc4536c81a542e8dd9f1746f8d1"
- dependencies:
- babel-runtime "^6.22.0"
+array-union@^2.1.0:
+ version "2.1.0"
+ resolved "https://registry.yarnpkg.com/array-union/-/array-union-2.1.0.tgz#b798420adbeb1de828d84acd8a2e23d3efe85e8d"
+ integrity sha512-HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw==
-babel-plugin-transform-es2015-sticky-regex@^6.22.0:
- version "6.24.1"
- resolved "http://registry.npm.taobao.org/babel-plugin-transform-es2015-sticky-regex/download/babel-plugin-transform-es2015-sticky-regex-6.24.1.tgz#00c1cdb1aca71112cdf0cf6126c2ed6b457ccdbc"
- dependencies:
- babel-helper-regex "^6.24.1"
- babel-runtime "^6.22.0"
- babel-types "^6.24.1"
+array-uniq@^1.0.1:
+ version "1.0.3"
+ resolved "https://registry.yarnpkg.com/array-uniq/-/array-uniq-1.0.3.tgz#af6ac877a25cc7f74e058894753858dfdb24fdb6"
+ integrity sha1-r2rId6Jcx/dOBYiUdThY39sk/bY=
-babel-plugin-transform-es2015-template-literals@^6.22.0:
- version "6.22.0"
- resolved "http://registry.npm.taobao.org/babel-plugin-transform-es2015-template-literals/download/babel-plugin-transform-es2015-template-literals-6.22.0.tgz#a84b3450f7e9f8f1f6839d6d687da84bb1236d8d"
- dependencies:
- babel-runtime "^6.22.0"
+array-unique@^0.3.2:
+ version "0.3.2"
+ resolved "https://registry.yarnpkg.com/array-unique/-/array-unique-0.3.2.tgz#a894b75d4bc4f6cd679ef3244a9fd8f46ae2d428"
+ integrity sha1-qJS3XUvE9s1nnvMkSp/Y9Gri1Cg=
-babel-plugin-transform-es2015-typeof-symbol@^6.23.0:
- version "6.23.0"
- resolved "http://registry.npm.taobao.org/babel-plugin-transform-es2015-typeof-symbol/download/babel-plugin-transform-es2015-typeof-symbol-6.23.0.tgz#dec09f1cddff94b52ac73d505c84df59dcceb372"
- dependencies:
- babel-runtime "^6.22.0"
+arrify@^1.0.1:
+ version "1.0.1"
+ resolved "https://registry.yarnpkg.com/arrify/-/arrify-1.0.1.tgz#898508da2226f380df904728456849c1501a4b0d"
+ integrity sha1-iYUI2iIm84DfkEcoRWhJwVAaSw0=
-babel-plugin-transform-es2015-unicode-regex@^6.22.0:
- version "6.24.1"
- resolved "http://registry.npm.taobao.org/babel-plugin-transform-es2015-unicode-regex/download/babel-plugin-transform-es2015-unicode-regex-6.24.1.tgz#d38b12f42ea7323f729387f18a7c5ae1faeb35e9"
+asn1.js@^4.0.0:
+ version "4.10.1"
+ resolved "https://registry.yarnpkg.com/asn1.js/-/asn1.js-4.10.1.tgz#b9c2bf5805f1e64aadeed6df3a2bfafb5a73f5a0"
+ integrity sha512-p32cOF5q0Zqs9uBiONKYLm6BClCoBCM5O9JfeUSlnQLBTxYdTK+pW+nXflm8UkKd2UYlEbYz5qEi0JuZR9ckSw==
dependencies:
- babel-helper-regex "^6.24.1"
- babel-runtime "^6.22.0"
- regexpu-core "^2.0.0"
+ bn.js "^4.0.0"
+ inherits "^2.0.1"
+ minimalistic-assert "^1.0.0"
-babel-plugin-transform-exponentiation-operator@^6.22.0:
- version "6.24.1"
- resolved "http://registry.npm.taobao.org/babel-plugin-transform-exponentiation-operator/download/babel-plugin-transform-exponentiation-operator-6.24.1.tgz#2ab0c9c7f3098fa48907772bb813fe41e8de3a0e"
+asn1@~0.2.3:
+ version "0.2.4"
+ resolved "https://registry.yarnpkg.com/asn1/-/asn1-0.2.4.tgz#8d2475dfab553bb33e77b54e59e880bb8ce23136"
+ integrity sha512-jxwzQpLQjSmWXgwaCZE9Nz+glAG01yF1QnWgbhGwHI5A6FRIEY6IVqtHhIepHqI7/kyEyQEagBC5mBEFlIYvdg==
dependencies:
- babel-helper-builder-binary-assignment-operator-visitor "^6.24.1"
- babel-plugin-syntax-exponentiation-operator "^6.8.0"
- babel-runtime "^6.22.0"
+ safer-buffer "~2.1.0"
-babel-plugin-transform-flow-strip-types@^6.22.0:
- version "6.22.0"
- resolved "http://registry.npm.taobao.org/babel-plugin-transform-flow-strip-types/download/babel-plugin-transform-flow-strip-types-6.22.0.tgz#84cb672935d43714fdc32bce84568d87441cf7cf"
- dependencies:
- babel-plugin-syntax-flow "^6.18.0"
- babel-runtime "^6.22.0"
[email protected], assert-plus@^1.0.0:
+ version "1.0.0"
+ resolved "https://registry.yarnpkg.com/assert-plus/-/assert-plus-1.0.0.tgz#f12e0f3c5d77b0b1cdd9146942e4e96c1e4dd525"
+ integrity sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU=
-babel-plugin-transform-object-rest-spread@^6.26.0:
- version "6.26.0"
- resolved "http://registry.npm.taobao.org/babel-plugin-transform-object-rest-spread/download/babel-plugin-transform-object-rest-spread-6.26.0.tgz#0f36692d50fef6b7e2d4b3ac1478137a963b7b06"
+assert@^1.1.1:
+ version "1.5.0"
+ resolved "https://registry.yarnpkg.com/assert/-/assert-1.5.0.tgz#55c109aaf6e0aefdb3dc4b71240c70bf574b18eb"
+ integrity sha512-EDsgawzwoun2CZkCgtxJbv392v4nbk9XDD06zI+kQYoBM/3RBWLlEyJARDOmhAAosBjWACEkKL6S+lIZtcAubA==
dependencies:
- babel-plugin-syntax-object-rest-spread "^6.8.0"
- babel-runtime "^6.26.0"
+ object-assign "^4.1.1"
+ util "0.10.3"
-babel-plugin-transform-react-display-name@^6.23.0:
- version "6.25.0"
- resolved "http://registry.npm.taobao.org/babel-plugin-transform-react-display-name/download/babel-plugin-transform-react-display-name-6.25.0.tgz#67e2bf1f1e9c93ab08db96792e05392bf2cc28d1"
- dependencies:
- babel-runtime "^6.22.0"
+assign-symbols@^1.0.0:
+ version "1.0.0"
+ resolved "https://registry.yarnpkg.com/assign-symbols/-/assign-symbols-1.0.0.tgz#59667f41fadd4f20ccbc2bb96b8d4f7f78ec0367"
+ integrity sha1-WWZ/QfrdTyDMvCu5a41Pf3jsA2c=
-babel-plugin-transform-react-jsx-self@^6.22.0:
- version "6.22.0"
- resolved "http://registry.npm.taobao.org/babel-plugin-transform-react-jsx-self/download/babel-plugin-transform-react-jsx-self-6.22.0.tgz#df6d80a9da2612a121e6ddd7558bcbecf06e636e"
- dependencies:
- babel-plugin-syntax-jsx "^6.8.0"
- babel-runtime "^6.22.0"
[email protected]:
+ version "0.9.6"
+ resolved "https://registry.yarnpkg.com/ast-types/-/ast-types-0.9.6.tgz#102c9e9e9005d3e7e3829bf0c4fa24ee862ee9b9"
+ integrity sha1-ECyenpAF0+fjgpvwxPok7oYu6bk=
-babel-plugin-transform-react-jsx-source@^6.22.0:
- version "6.22.0"
- resolved "http://registry.npm.taobao.org/babel-plugin-transform-react-jsx-source/download/babel-plugin-transform-react-jsx-source-6.22.0.tgz#66ac12153f5cd2d17b3c19268f4bf0197f44ecd6"
- dependencies:
- babel-plugin-syntax-jsx "^6.8.0"
- babel-runtime "^6.22.0"
+astral-regex@^1.0.0:
+ version "1.0.0"
+ resolved "https://registry.yarnpkg.com/astral-regex/-/astral-regex-1.0.0.tgz#6c8c3fb827dd43ee3918f27b82782ab7658a6fd9"
+ integrity sha512-+Ryf6g3BKoRc7jfp7ad8tM4TtMiaWvbF/1/sQcZPkkS7ag3D5nMBCe2UfOTONtAkaG0tO0ij3C5Lwmf1EiyjHg==
-babel-plugin-transform-react-jsx@^6.24.1:
- version "6.24.1"
- resolved "http://registry.npm.taobao.org/babel-plugin-transform-react-jsx/download/babel-plugin-transform-react-jsx-6.24.1.tgz#840a028e7df460dfc3a2d29f0c0d91f6376e66a3"
- dependencies:
- babel-helper-builder-react-jsx "^6.24.1"
- babel-plugin-syntax-jsx "^6.8.0"
- babel-runtime "^6.22.0"
+async-each@^1.0.1:
+ version "1.0.3"
+ resolved "https://registry.yarnpkg.com/async-each/-/async-each-1.0.3.tgz#b727dbf87d7651602f06f4d4ac387f47d91b0cbf"
+ integrity sha512-z/WhQ5FPySLdvREByI2vZiTWwCnF0moMJ1hK9YQwDTHKh6I7/uSckMetoRGb5UBZPC1z0jlw+n/XCgjeH7y1AQ==
-babel-plugin-transform-regenerator@^6.22.0:
- version "6.26.0"
- resolved "http://registry.npm.taobao.org/babel-plugin-transform-regenerator/download/babel-plugin-transform-regenerator-6.26.0.tgz#e0703696fbde27f0a3efcacf8b4dca2f7b3a8f2f"
- dependencies:
- regenerator-transform "^0.10.0"
+async-limiter@~1.0.0:
+ version "1.0.0"
+ resolved "https://registry.yarnpkg.com/async-limiter/-/async-limiter-1.0.0.tgz#78faed8c3d074ab81f22b4e985d79e8738f720f8"
+ integrity sha512-jp/uFnooOiO+L211eZOoSyzpOITMXx1rBITauYykG3BRYPu8h0UcxsPNB04RR5vo4Tyz3+ay17tR6JVf9qzYWg==
-babel-plugin-transform-strict-mode@^6.24.1:
- version "6.24.1"
- resolved "http://registry.npm.taobao.org/babel-plugin-transform-strict-mode/download/babel-plugin-transform-strict-mode-6.24.1.tgz#d5faf7aa578a65bbe591cf5edae04a0c67020758"
- dependencies:
- babel-runtime "^6.22.0"
- babel-types "^6.24.1"
+async@^1.5.2:
+ version "1.5.2"
+ resolved "https://registry.yarnpkg.com/async/-/async-1.5.2.tgz#ec6a61ae56480c0c3cb241c95618e20892f9672a"
+ integrity sha1-7GphrlZIDAw8skHJVhjiCJL5Zyo=
[email protected]:
- version "6.23.0"
- resolved "http://registry.npm.taobao.org/babel-polyfill/download/babel-polyfill-6.23.0.tgz#8364ca62df8eafb830499f699177466c3b03499d"
+async@^2.0.0:
+ version "2.6.2"
+ resolved "https://registry.yarnpkg.com/async/-/async-2.6.2.tgz#18330ea7e6e313887f5d2f2a904bac6fe4dd5381"
+ integrity sha512-H1qVYh1MYhEEFLsP97cVKqCGo7KfCyTt6uEWqsTBr9SO84oK9Uwbyd/yCW+6rKJLHksBNUVWZDAjfS+Ccx0Bbg==
dependencies:
- babel-runtime "^6.22.0"
- core-js "^2.4.0"
- regenerator-runtime "^0.10.0"
+ lodash "^4.17.11"
[email protected]:
- version "6.26.0"
- resolved "http://registry.npm.taobao.org/babel-polyfill/download/babel-polyfill-6.26.0.tgz#379937abc67d7895970adc621f284cd966cf2153"
- dependencies:
- babel-runtime "^6.26.0"
- core-js "^2.5.0"
- regenerator-runtime "^0.10.5"
+asynckit@^0.4.0:
+ version "0.4.0"
+ resolved "https://registry.yarnpkg.com/asynckit/-/asynckit-0.4.0.tgz#c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79"
+ integrity sha1-x57Zf380y48robyXkLzDZkdLS3k=
-babel-preset-env@^1.6.1:
- version "1.7.0"
- resolved "http://registry.npm.taobao.org/babel-preset-env/download/babel-preset-env-1.7.0.tgz#dea79fa4ebeb883cd35dab07e260c1c9c04df77a"
- dependencies:
- babel-plugin-check-es2015-constants "^6.22.0"
- babel-plugin-syntax-trailing-function-commas "^6.22.0"
- babel-plugin-transform-async-to-generator "^6.22.0"
- babel-plugin-transform-es2015-arrow-functions "^6.22.0"
- babel-plugin-transform-es2015-block-scoped-functions "^6.22.0"
- babel-plugin-transform-es2015-block-scoping "^6.23.0"
- babel-plugin-transform-es2015-classes "^6.23.0"
- babel-plugin-transform-es2015-computed-properties "^6.22.0"
- babel-plugin-transform-es2015-destructuring "^6.23.0"
- babel-plugin-transform-es2015-duplicate-keys "^6.22.0"
- babel-plugin-transform-es2015-for-of "^6.23.0"
- babel-plugin-transform-es2015-function-name "^6.22.0"
- babel-plugin-transform-es2015-literals "^6.22.0"
- babel-plugin-transform-es2015-modules-amd "^6.22.0"
- babel-plugin-transform-es2015-modules-commonjs "^6.23.0"
- babel-plugin-transform-es2015-modules-systemjs "^6.23.0"
- babel-plugin-transform-es2015-modules-umd "^6.23.0"
- babel-plugin-transform-es2015-object-super "^6.22.0"
- babel-plugin-transform-es2015-parameters "^6.23.0"
- babel-plugin-transform-es2015-shorthand-properties "^6.22.0"
- babel-plugin-transform-es2015-spread "^6.22.0"
- babel-plugin-transform-es2015-sticky-regex "^6.22.0"
- babel-plugin-transform-es2015-template-literals "^6.22.0"
- babel-plugin-transform-es2015-typeof-symbol "^6.23.0"
- babel-plugin-transform-es2015-unicode-regex "^6.22.0"
- babel-plugin-transform-exponentiation-operator "^6.22.0"
- babel-plugin-transform-regenerator "^6.22.0"
- browserslist "^3.2.6"
- invariant "^2.2.2"
- semver "^5.3.0"
+atob@^2.1.1:
+ version "2.1.2"
+ resolved "https://registry.yarnpkg.com/atob/-/atob-2.1.2.tgz#6d9517eb9e030d2436666651e86bd9f6f13533c9"
+ integrity sha512-Wm6ukoaOGJi/73p/cl2GvLjTI5JM1k/O14isD73YML8StrH/7/lRFgmg8nICZgD3bZZvjwCGxtMOD3wWNAu8cg==
-babel-preset-flow@^6.23.0:
- version "6.23.0"
- resolved "http://registry.npm.taobao.org/babel-preset-flow/download/babel-preset-flow-6.23.0.tgz#e71218887085ae9a24b5be4169affb599816c49d"
- dependencies:
- babel-plugin-transform-flow-strip-types "^6.22.0"
+aws-sign2@~0.7.0:
+ version "0.7.0"
+ resolved "https://registry.yarnpkg.com/aws-sign2/-/aws-sign2-0.7.0.tgz#b46e890934a9591f2d2f6f86d7e6a9f1b3fe76a8"
+ integrity sha1-tG6JCTSpWR8tL2+G1+ap8bP+dqg=
-babel-preset-jest@^22.4.1, babel-preset-jest@^22.4.3, babel-preset-jest@^22.4.4:
- version "22.4.4"
- resolved "http://registry.npm.taobao.org/babel-preset-jest/download/babel-preset-jest-22.4.4.tgz#ec9fbd8bcd7dfd24b8b5320e0e688013235b7c39"
+aws4@^1.8.0:
+ version "1.8.0"
+ resolved "https://registry.yarnpkg.com/aws4/-/aws4-1.8.0.tgz#f0e003d9ca9e7f59c7a508945d7b2ef9a04a542f"
+ integrity sha512-ReZxvNHIOv88FlT7rxcXIIC0fPt4KZqZbOlivyWtXLt8ESx84zd3kMC6iK5jVeS2qt+g7ftS7ye4fi06X5rtRQ==
+
+babel-jest@^24.8.0:
+ version "24.8.0"
+ resolved "https://registry.yarnpkg.com/babel-jest/-/babel-jest-24.8.0.tgz#5c15ff2b28e20b0f45df43fe6b7f2aae93dba589"
+ integrity sha512-+5/kaZt4I9efoXzPlZASyK/lN9qdRKmmUav9smVc0ruPQD7IsfucQ87gpOE8mn2jbDuS6M/YOW6n3v9ZoIfgnw==
+ dependencies:
+ "@jest/transform" "^24.8.0"
+ "@jest/types" "^24.8.0"
+ "@types/babel__core" "^7.1.0"
+ babel-plugin-istanbul "^5.1.0"
+ babel-preset-jest "^24.6.0"
+ chalk "^2.4.2"
+ slash "^2.0.0"
+
+babel-loader@^8.0.5:
+ version "8.0.6"
+ resolved "https://registry.yarnpkg.com/babel-loader/-/babel-loader-8.0.6.tgz#e33bdb6f362b03f4bb141a0c21ab87c501b70dfb"
+ integrity sha512-4BmWKtBOBm13uoUwd08UwjZlaw3O9GWf456R9j+5YykFZ6LUIjIKLc0zEZf+hauxPOJs96C8k6FvYD09vWzhYw==
dependencies:
- babel-plugin-jest-hoist "^22.4.4"
- babel-plugin-syntax-object-rest-spread "^6.13.0"
+ find-cache-dir "^2.0.0"
+ loader-utils "^1.0.2"
+ mkdirp "^0.5.1"
+ pify "^4.0.1"
-babel-preset-react@^6.24.1:
- version "6.24.1"
- resolved "http://registry.npm.taobao.org/babel-preset-react/download/babel-preset-react-6.24.1.tgz#ba69dfaea45fc3ec639b6a4ecea6e17702c91380"
+babel-merge@^3.0.0:
+ version "3.0.0"
+ resolved "https://registry.yarnpkg.com/babel-merge/-/babel-merge-3.0.0.tgz#9bd368d48116dab18b8f3e8022835479d80f3b50"
+ integrity sha512-eBOBtHnzt9xvnjpYNI5HmaPp/b2vMveE5XggzqHnQeHJ8mFIBrBv6WZEVIj5jJ2uwTItkqKo9gWzEEcBxEq0yw==
dependencies:
- babel-plugin-syntax-jsx "^6.3.13"
- babel-plugin-transform-react-display-name "^6.23.0"
- babel-plugin-transform-react-jsx "^6.24.1"
- babel-plugin-transform-react-jsx-self "^6.22.0"
- babel-plugin-transform-react-jsx-source "^6.22.0"
- babel-preset-flow "^6.23.0"
+ deepmerge "^2.2.1"
+ object.omit "^3.0.0"
-babel-register@^6.26.0:
- version "6.26.0"
- resolved "http://registry.npm.taobao.org/babel-register/download/babel-register-6.26.0.tgz#6ed021173e2fcb486d7acb45c6009a856f647071"
+babel-plugin-dynamic-import-node@^2.3.0:
+ version "2.3.0"
+ resolved "https://registry.yarnpkg.com/babel-plugin-dynamic-import-node/-/babel-plugin-dynamic-import-node-2.3.0.tgz#f00f507bdaa3c3e3ff6e7e5e98d90a7acab96f7f"
+ integrity sha512-o6qFkpeQEBxcqt0XYlWzAVxNCSCZdUgcR8IRlhD/8DylxjjO4foPcvTW0GGKa/cVt3rvxZ7o5ippJ+/0nvLhlQ==
dependencies:
- babel-core "^6.26.0"
- babel-runtime "^6.26.0"
- core-js "^2.5.0"
- home-or-tmp "^2.0.0"
- lodash "^4.17.4"
- mkdirp "^0.5.1"
- source-map-support "^0.4.15"
+ object.assign "^4.1.0"
[email protected], [email protected], babel-runtime@^6.18.0, babel-runtime@^6.22.0, babel-runtime@^6.23.0, babel-runtime@^6.26.0, babel-runtime@^6.9.2:
- version "6.26.0"
- resolved "http://registry.npm.taobao.org/babel-runtime/download/babel-runtime-6.26.0.tgz#965c7058668e82b55d7bfe04ff2337bc8b5647fe"
+babel-plugin-istanbul@^5.1.0:
+ version "5.1.4"
+ resolved "https://registry.yarnpkg.com/babel-plugin-istanbul/-/babel-plugin-istanbul-5.1.4.tgz#841d16b9a58eeb407a0ddce622ba02fe87a752ba"
+ integrity sha512-dySz4VJMH+dpndj0wjJ8JPs/7i1TdSPb1nRrn56/92pKOF9VKC1FMFJmMXjzlGGusnCAqujP6PBCiKq0sVA+YQ==
dependencies:
- core-js "^2.4.0"
- regenerator-runtime "^0.11.0"
+ find-up "^3.0.0"
+ istanbul-lib-instrument "^3.3.0"
+ test-exclude "^5.2.3"
-babel-template@^6.16.0, babel-template@^6.24.1, babel-template@^6.26.0:
- version "6.26.0"
- resolved "http://registry.npm.taobao.org/babel-template/download/babel-template-6.26.0.tgz#de03e2d16396b069f46dd9fff8521fb1a0e35e02"
+babel-plugin-jest-hoist@^24.6.0:
+ version "24.6.0"
+ resolved "https://registry.yarnpkg.com/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-24.6.0.tgz#f7f7f7ad150ee96d7a5e8e2c5da8319579e78019"
+ integrity sha512-3pKNH6hMt9SbOv0F3WVmy5CWQ4uogS3k0GY5XLyQHJ9EGpAT9XWkFd2ZiXXtkwFHdAHa5j7w7kfxSP5lAIwu7w==
dependencies:
- babel-runtime "^6.26.0"
- babel-traverse "^6.26.0"
- babel-types "^6.26.0"
- babylon "^6.18.0"
- lodash "^4.17.4"
+ "@types/babel__traverse" "^7.0.6"
-babel-traverse@^6.18.0, babel-traverse@^6.24.1, babel-traverse@^6.26.0:
+babel-plugin-transform-react-remove-prop-types@^0.4.24:
+ version "0.4.24"
+ resolved "https://registry.yarnpkg.com/babel-plugin-transform-react-remove-prop-types/-/babel-plugin-transform-react-remove-prop-types-0.4.24.tgz#f2edaf9b4c6a5fbe5c1d678bfb531078c1555f3a"
+ integrity sha512-eqj0hVcJUR57/Ug2zE1Yswsw4LhuqqHhD+8v120T1cl3kjg76QwtyBrdIk4WVwK+lAhBJVYCd/v+4nc4y+8JsA==
+
[email protected]:
version "6.26.0"
- resolved "http://registry.npm.taobao.org/babel-traverse/download/babel-traverse-6.26.0.tgz#46a9cbd7edcc62c8e5c064e2d2d8d0f4035766ee"
+ resolved "https://registry.yarnpkg.com/babel-polyfill/-/babel-polyfill-6.26.0.tgz#379937abc67d7895970adc621f284cd966cf2153"
+ integrity sha1-N5k3q8Z9eJWXCtxiHyhM2WbPIVM=
dependencies:
- babel-code-frame "^6.26.0"
- babel-messages "^6.23.0"
babel-runtime "^6.26.0"
- babel-types "^6.26.0"
- babylon "^6.18.0"
- debug "^2.6.8"
- globals "^9.18.0"
- invariant "^2.2.2"
- lodash "^4.17.4"
+ core-js "^2.5.0"
+ regenerator-runtime "^0.10.5"
[email protected]:
- version "7.0.0-beta.3"
- resolved "http://registry.npm.taobao.org/babel-types/download/babel-types-7.0.0-beta.3.tgz#cd927ca70e0ae8ab05f4aab83778cfb3e6eb20b4"
+babel-preset-jest@^24.6.0:
+ version "24.6.0"
+ resolved "https://registry.yarnpkg.com/babel-preset-jest/-/babel-preset-jest-24.6.0.tgz#66f06136eefce87797539c0d63f1769cc3915984"
+ integrity sha512-pdZqLEdmy1ZK5kyRUfvBb2IfTPb2BUvIJczlPspS8fWmBQslNNDBqVfh7BW5leOVJMDZKzjD8XEyABTk6gQ5yw==
dependencies:
- esutils "^2.0.2"
- lodash "^4.2.0"
- to-fast-properties "^2.0.0"
+ "@babel/plugin-syntax-object-rest-spread" "^7.0.0"
+ babel-plugin-jest-hoist "^24.6.0"
-babel-types@^6.18.0, babel-types@^6.19.0, babel-types@^6.24.1, babel-types@^6.26.0:
[email protected], babel-runtime@^6.23.0, babel-runtime@^6.26.0:
version "6.26.0"
- resolved "http://registry.npm.taobao.org/babel-types/download/babel-types-6.26.0.tgz#a3b073f94ab49eb6fa55cd65227a334380632497"
+ resolved "https://registry.yarnpkg.com/babel-runtime/-/babel-runtime-6.26.0.tgz#965c7058668e82b55d7bfe04ff2337bc8b5647fe"
+ integrity sha1-llxwWGaOgrVde/4E/yM3vItWR/4=
dependencies:
- babel-runtime "^6.26.0"
- esutils "^2.0.2"
- lodash "^4.17.4"
- to-fast-properties "^1.0.3"
-
-babylon@^6.18.0:
- version "6.18.0"
- resolved "http://registry.npm.taobao.org/babylon/download/babylon-6.18.0.tgz#af2f3b88fa6f5c1e4c634d1a0f8eac4f55b395e3"
-
-balanced-match@^0.4.2:
- version "0.4.2"
- resolved "http://registry.npm.taobao.org/balanced-match/download/balanced-match-0.4.2.tgz#cb3f3e3c732dc0f01ee70b403f302e61d7709838"
+ core-js "^2.4.0"
+ regenerator-runtime "^0.11.0"
balanced-match@^1.0.0:
version "1.0.0"
- resolved "http://registry.npm.taobao.org/balanced-match/download/balanced-match-1.0.0.tgz#89b4d199ab2bee49de164ea02b89ce462d71b767"
+ resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.0.tgz#89b4d199ab2bee49de164ea02b89ce462d71b767"
+ integrity sha1-ibTRmasr7kneFk6gK4nORi1xt2c=
base64-js@^1.0.2:
version "1.3.0"
- resolved "http://registry.npm.taobao.org/base64-js/download/base64-js-1.3.0.tgz#cab1e6118f051095e58b5281aea8c1cd22bfc0e3"
+ resolved "https://registry.yarnpkg.com/base64-js/-/base64-js-1.3.0.tgz#cab1e6118f051095e58b5281aea8c1cd22bfc0e3"
+ integrity sha512-ccav/yGvoa80BQDljCxsmmQ3Xvx60/UpBIij5QN21W3wBi/hhIC9OoO+KLpu9IJTS9j4DRVJ3aDDF9cMSoa2lw==
base@^0.11.1:
version "0.11.2"
- resolved "http://registry.npm.taobao.org/base/download/base-0.11.2.tgz#7bde5ced145b6d551a90db87f83c558b4eb48a8f"
+ resolved "https://registry.yarnpkg.com/base/-/base-0.11.2.tgz#7bde5ced145b6d551a90db87f83c558b4eb48a8f"
+ integrity sha512-5T6P4xPgpp0YDFvSWwEZ4NoE3aM4QBQXDzmVbraCkFj8zHM+mba8SyqB5DbZWyR7mYHo6Y7BdQo3MoA4m0TeQg==
dependencies:
cache-base "^1.0.1"
class-utils "^0.3.5"
@@ -1391,69 +1909,64 @@ base@^0.11.1:
[email protected]:
version "0.6.1"
- resolved "http://registry.npm.taobao.org/batch/download/batch-0.6.1.tgz#dc34314f4e679318093fc760272525f94bf25c16"
+ resolved "https://registry.yarnpkg.com/batch/-/batch-0.6.1.tgz#dc34314f4e679318093fc760272525f94bf25c16"
+ integrity sha1-3DQxT05nkxgJP8dgJyUl+UvyXBY=
bcrypt-pbkdf@^1.0.0:
- version "1.0.1"
- resolved "http://registry.npm.taobao.org/bcrypt-pbkdf/download/bcrypt-pbkdf-1.0.1.tgz#63bc5dcb61331b92bc05fd528953c33462a06f8d"
+ version "1.0.2"
+ resolved "https://registry.yarnpkg.com/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.2.tgz#a4301d389b6a43f9b67ff3ca11a3f6637e360e9e"
+ integrity sha1-pDAdOJtqQ/m2f/PKEaP2Y342Dp4=
dependencies:
tweetnacl "^0.14.3"
-bfj-node4@^5.2.0:
- version "5.3.1"
- resolved "http://registry.npm.taobao.org/bfj-node4/download/bfj-node4-5.3.1.tgz#e23d8b27057f1d0214fc561142ad9db998f26830"
- dependencies:
- bluebird "^3.5.1"
- check-types "^7.3.0"
- tryer "^1.0.0"
-
-big.js@^3.1.3:
- version "3.2.0"
- resolved "http://registry.npm.taobao.org/big.js/download/big.js-3.2.0.tgz#a5fc298b81b9e0dca2e458824784b65c52ba588e"
+big.js@^5.2.2:
+ version "5.2.2"
+ resolved "https://registry.yarnpkg.com/big.js/-/big.js-5.2.2.tgz#65f0af382f578bcdc742bd9c281e9cb2d7768328"
+ integrity sha512-vyL2OymJxmarO8gxMr0mhChsO9QGwhynfuu4+MHTAW6czfq9humCB7rKpUjDd9YUiDPU4mzpyupFSvOClAwbmQ==
binary-extensions@^1.0.0:
- version "1.11.0"
- resolved "http://registry.npm.taobao.org/binary-extensions/download/binary-extensions-1.11.0.tgz#46aa1751fb6a2f93ee5e689bb1087d4b14c6c205"
+ version "1.13.1"
+ resolved "https://registry.yarnpkg.com/binary-extensions/-/binary-extensions-1.13.1.tgz#598afe54755b2868a5330d2aff9d4ebb53209b65"
+ integrity sha512-Un7MIEDdUC5gNpcGDV97op1Ywk748MpHcFTHoYs6qnj1Z3j7I53VG3nwZhKzoBZmbdRNnb6WRdFlwl7tSDuZGw==
bl@^1.0.0:
version "1.2.2"
- resolved "http://registry.npm.taobao.org/bl/download/bl-1.2.2.tgz#a160911717103c07410cef63ef51b397c025af9c"
+ resolved "https://registry.yarnpkg.com/bl/-/bl-1.2.2.tgz#a160911717103c07410cef63ef51b397c025af9c"
+ integrity sha512-e8tQYnZodmebYDWGH7KMRvtzKXaJHx3BbilrgZCfvyLUYdKpK1t5PSPmpkny/SgiTSCnjfLW7v5rlONXVFkQEA==
dependencies:
readable-stream "^2.3.5"
safe-buffer "^5.1.1"
-block-stream@*:
- version "0.0.9"
- resolved "http://registry.npm.taobao.org/block-stream/download/block-stream-0.0.9.tgz#13ebfe778a03205cfe03751481ebb4b3300c126a"
- dependencies:
- inherits "~2.0.0"
-
-bluebird@^3.1.1, bluebird@^3.5.1:
- version "3.5.1"
- resolved "http://registry.npm.taobao.org/bluebird/download/bluebird-3.5.1.tgz#d9551f9de98f1fcda1e683d17ee91a0602ee2eb9"
+bluebird@^3.5.1, bluebird@^3.5.5:
+ version "3.5.5"
+ resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-3.5.5.tgz#a8d0afd73251effbbd5fe384a77d73003c17a71f"
+ integrity sha512-5am6HnnfN+urzt4yfg7IgTbotDjIT/u8AJpEt0sIU9FtXfVeezXAPKswrG+xKUCOYAINpSdgZVDU6QFh+cuH3w==
bn.js@^4.0.0, bn.js@^4.1.0, bn.js@^4.1.1, bn.js@^4.4.0:
version "4.11.8"
- resolved "http://registry.npm.taobao.org/bn.js/download/bn.js-4.11.8.tgz#2cde09eb5ee341f484746bb0309b3253b1b1442f"
+ resolved "https://registry.yarnpkg.com/bn.js/-/bn.js-4.11.8.tgz#2cde09eb5ee341f484746bb0309b3253b1b1442f"
+ integrity sha512-ItfYfPLkWHUjckQCk8xC+LwxgK8NYcXywGigJgSwOP8Y2iyWT4f2vsZnoOXTTbo+o5yXmIUJ4gn5538SO5S3gA==
[email protected]:
- version "1.18.2"
- resolved "http://registry.npm.taobao.org/body-parser/download/body-parser-1.18.2.tgz#87678a19d84b47d859b83199bd59bce222b10454"
[email protected]:
+ version "1.19.0"
+ resolved "https://registry.yarnpkg.com/body-parser/-/body-parser-1.19.0.tgz#96b2709e57c9c4e09a6fd66a8fd979844f69f08a"
+ integrity sha512-dhEPs72UPbDnAQJ9ZKMNTP6ptJaionhP5cBb541nXPlW60Jepo9RV/a4fX4XWW9CuFNK22krhrj1+rgzifNCsw==
dependencies:
- bytes "3.0.0"
+ bytes "3.1.0"
content-type "~1.0.4"
debug "2.6.9"
- depd "~1.1.1"
- http-errors "~1.6.2"
- iconv-lite "0.4.19"
+ depd "~1.1.2"
+ http-errors "1.7.2"
+ iconv-lite "0.4.24"
on-finished "~2.3.0"
- qs "6.5.1"
- raw-body "2.3.2"
- type-is "~1.6.15"
+ qs "6.7.0"
+ raw-body "2.4.0"
+ type-is "~1.6.17"
bonjour@^3.5.0:
version "3.5.0"
- resolved "http://registry.npm.taobao.org/bonjour/download/bonjour-3.5.0.tgz#8e890a183d8ee9a2393b3844c691a42bcf7bc9f5"
+ resolved "https://registry.yarnpkg.com/bonjour/-/bonjour-3.5.0.tgz#8e890a183d8ee9a2393b3844c691a42bcf7bc9f5"
+ integrity sha1-jokKGD2O6aI5OzhExpGkK897yfU=
dependencies:
array-flatten "^2.1.0"
deep-equal "^1.0.1"
@@ -1464,32 +1977,21 @@ bonjour@^3.5.0:
boolbase@~1.0.0:
version "1.0.0"
- resolved "http://registry.npm.taobao.org/boolbase/download/boolbase-1.0.0.tgz#68dff5fbe60c51eb37725ea9e3ed310dcc1e776e"
-
[email protected]:
- version "2.10.1"
- resolved "http://registry.npm.taobao.org/boom/download/boom-2.10.1.tgz#39c8918ceff5799f83f9492a848f625add0c766f"
- dependencies:
- hoek "2.x.x"
+ resolved "https://registry.yarnpkg.com/boolbase/-/boolbase-1.0.0.tgz#68dff5fbe60c51eb37725ea9e3ed310dcc1e776e"
+ integrity sha1-aN/1++YMUes3cl6p4+0xDcwed24=
-brace-expansion@^1.0.0, brace-expansion@^1.1.7:
+brace-expansion@^1.1.7:
version "1.1.11"
- resolved "http://registry.npm.taobao.org/brace-expansion/download/brace-expansion-1.1.11.tgz#3c7fcbf529d87226f3d2f52b966ff5271eb441dd"
+ resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-1.1.11.tgz#3c7fcbf529d87226f3d2f52b966ff5271eb441dd"
+ integrity sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==
dependencies:
balanced-match "^1.0.0"
concat-map "0.0.1"
-braces@^1.8.2:
- version "1.8.5"
- resolved "http://registry.npm.taobao.org/braces/download/braces-1.8.5.tgz#ba77962e12dff969d6b76711e914b737857bf6a7"
- dependencies:
- expand-range "^1.8.1"
- preserve "^0.2.0"
- repeat-element "^1.1.2"
-
-braces@^2.3.0, braces@^2.3.1:
+braces@^2.3.1, braces@^2.3.2:
version "2.3.2"
- resolved "http://registry.npm.taobao.org/braces/download/braces-2.3.2.tgz#5979fd3f14cd531565e5fa2df1abfff1dfaee729"
+ resolved "https://registry.yarnpkg.com/braces/-/braces-2.3.2.tgz#5979fd3f14cd531565e5fa2df1abfff1dfaee729"
+ integrity sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==
dependencies:
arr-flatten "^1.1.0"
array-unique "^0.3.2"
@@ -1502,23 +2004,34 @@ braces@^2.3.0, braces@^2.3.1:
split-string "^3.0.2"
to-regex "^3.0.1"
+braces@^3.0.1:
+ version "3.0.2"
+ resolved "https://registry.yarnpkg.com/braces/-/braces-3.0.2.tgz#3454e1a462ee8d599e236df336cd9ea4f8afe107"
+ integrity sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==
+ dependencies:
+ fill-range "^7.0.1"
+
brorand@^1.0.1:
version "1.1.0"
- resolved "http://registry.npm.taobao.org/brorand/download/brorand-1.1.0.tgz#12c25efe40a45e3c323eb8675a0a0ce57b22371f"
+ resolved "https://registry.yarnpkg.com/brorand/-/brorand-1.1.0.tgz#12c25efe40a45e3c323eb8675a0a0ce57b22371f"
+ integrity sha1-EsJe/kCkXjwyPrhnWgoM5XsiNx8=
browser-process-hrtime@^0.1.2:
- version "0.1.2"
- resolved "http://registry.npm.taobao.org/browser-process-hrtime/download/browser-process-hrtime-0.1.2.tgz#425d68a58d3447f02a04aa894187fce8af8b7b8e"
+ version "0.1.3"
+ resolved "https://registry.yarnpkg.com/browser-process-hrtime/-/browser-process-hrtime-0.1.3.tgz#616f00faef1df7ec1b5bf9cfe2bdc3170f26c7b4"
+ integrity sha512-bRFnI4NnjO6cnyLmOV/7PVoDEMJChlcfN0z4s1YMBY989/SvlfMI1lgCnkFUs53e9gQF+w7qu7XdllSTiSl8Aw==
-browser-resolve@^1.11.2:
- version "1.11.2"
- resolved "http://registry.npm.taobao.org/browser-resolve/download/browser-resolve-1.11.2.tgz#8ff09b0a2c421718a1051c260b32e48f442938ce"
+browser-resolve@^1.11.3:
+ version "1.11.3"
+ resolved "https://registry.yarnpkg.com/browser-resolve/-/browser-resolve-1.11.3.tgz#9b7cbb3d0f510e4cb86bdbd796124d28b5890af6"
+ integrity sha512-exDi1BYWB/6raKHmDTCicQfTkqwN5fioMFV4j8BsfMU4R2DK/QfZfK7kOVkmWCNANf0snkBzqGqAJBao9gZMdQ==
dependencies:
resolve "1.1.7"
browserify-aes@^1.0.0, browserify-aes@^1.0.4:
version "1.2.0"
- resolved "http://registry.npm.taobao.org/browserify-aes/download/browserify-aes-1.2.0.tgz#326734642f403dabc3003209853bb70ad428ef48"
+ resolved "https://registry.yarnpkg.com/browserify-aes/-/browserify-aes-1.2.0.tgz#326734642f403dabc3003209853bb70ad428ef48"
+ integrity sha512-+7CHXqGuspUn/Sl5aO7Ea0xWGAtETPXNSAjHo48JfLdPWcMng33Xe4znFvQweqc/uzk5zSOI3H52CYnjCfb5hA==
dependencies:
buffer-xor "^1.0.3"
cipher-base "^1.0.0"
@@ -1529,30 +2042,35 @@ browserify-aes@^1.0.0, browserify-aes@^1.0.4:
browserify-cipher@^1.0.0:
version "1.0.1"
- resolved "http://registry.npm.taobao.org/browserify-cipher/download/browserify-cipher-1.0.1.tgz#8d6474c1b870bfdabcd3bcfcc1934a10e94f15f0"
+ resolved "https://registry.yarnpkg.com/browserify-cipher/-/browserify-cipher-1.0.1.tgz#8d6474c1b870bfdabcd3bcfcc1934a10e94f15f0"
+ integrity sha512-sPhkz0ARKbf4rRQt2hTpAHqn47X3llLkUGn+xEJzLjwY8LRs2p0v7ljvI5EyoRO/mexrNunNECisZs+gw2zz1w==
dependencies:
browserify-aes "^1.0.4"
browserify-des "^1.0.0"
evp_bytestokey "^1.0.0"
browserify-des@^1.0.0:
- version "1.0.1"
- resolved "http://registry.npm.taobao.org/browserify-des/download/browserify-des-1.0.1.tgz#3343124db6d7ad53e26a8826318712bdc8450f9c"
+ version "1.0.2"
+ resolved "https://registry.yarnpkg.com/browserify-des/-/browserify-des-1.0.2.tgz#3af4f1f59839403572f1c66204375f7a7f703e9c"
+ integrity sha512-BioO1xf3hFwz4kc6iBhI3ieDFompMhrMlnDFC4/0/vd5MokpuAc3R+LYbwTA9A5Yc9pq9UYPqffKpW2ObuwX5A==
dependencies:
cipher-base "^1.0.1"
des.js "^1.0.0"
inherits "^2.0.1"
+ safe-buffer "^5.1.2"
browserify-rsa@^4.0.0:
version "4.0.1"
- resolved "http://registry.npm.taobao.org/browserify-rsa/download/browserify-rsa-4.0.1.tgz#21e0abfaf6f2029cf2fafb133567a701d4135524"
+ resolved "https://registry.yarnpkg.com/browserify-rsa/-/browserify-rsa-4.0.1.tgz#21e0abfaf6f2029cf2fafb133567a701d4135524"
+ integrity sha1-IeCr+vbyApzy+vsTNWenAdQTVSQ=
dependencies:
bn.js "^4.1.0"
randombytes "^2.0.1"
browserify-sign@^4.0.0:
version "4.0.4"
- resolved "http://registry.npm.taobao.org/browserify-sign/download/browserify-sign-4.0.4.tgz#aa4eb68e5d7b658baa6bf6a57e630cbd7a93d298"
+ resolved "https://registry.yarnpkg.com/browserify-sign/-/browserify-sign-4.0.4.tgz#aa4eb68e5d7b658baa6bf6a57e630cbd7a93d298"
+ integrity sha1-qk62jl17ZYuqa/alfmMMvXqT0pg=
dependencies:
bn.js "^4.1.1"
browserify-rsa "^4.0.0"
@@ -1564,91 +2082,101 @@ browserify-sign@^4.0.0:
browserify-zlib@^0.2.0:
version "0.2.0"
- resolved "http://registry.npm.taobao.org/browserify-zlib/download/browserify-zlib-0.2.0.tgz#2869459d9aa3be245fe8fe2ca1f46e2e7f54d73f"
+ resolved "https://registry.yarnpkg.com/browserify-zlib/-/browserify-zlib-0.2.0.tgz#2869459d9aa3be245fe8fe2ca1f46e2e7f54d73f"
+ integrity sha512-Z942RysHXmJrhqk88FmKBVq/v5tqmSkDz7p54G/MGyjMnCFFnC79XWNbg+Vta8W6Wb2qtSZTSxIGkJrRpCFEiA==
dependencies:
pako "~1.0.5"
-browserslist@^1.3.6, browserslist@^1.5.2, browserslist@^1.7.6:
- version "1.7.7"
- resolved "http://registry.npm.taobao.org/browserslist/download/browserslist-1.7.7.tgz#0bd76704258be829b2398bb50e4b62d1a166b0b9"
- dependencies:
- caniuse-db "^1.0.30000639"
- electron-to-chromium "^1.2.7"
-
-browserslist@^3.1.1, browserslist@^3.2.6:
- version "3.2.8"
- resolved "http://registry.npm.taobao.org/browserslist/download/browserslist-3.2.8.tgz#b0005361d6471f0f5952797a76fc985f1f978fc6"
+browserslist@^4.6.0, browserslist@^4.6.2:
+ version "4.6.3"
+ resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.6.3.tgz#0530cbc6ab0c1f3fc8c819c72377ba55cf647f05"
+ integrity sha512-CNBqTCq22RKM8wKJNowcqihHJ4SkI8CGeK7KOR9tPboXUuS5Zk5lQgzzTbs4oxD8x+6HUshZUa2OyNI9lR93bQ==
dependencies:
- caniuse-lite "^1.0.30000844"
- electron-to-chromium "^1.3.47"
+ caniuse-lite "^1.0.30000975"
+ electron-to-chromium "^1.3.164"
+ node-releases "^1.1.23"
bser@^2.0.0:
- version "2.0.0"
- resolved "http://registry.npm.taobao.org/bser/download/bser-2.0.0.tgz#9ac78d3ed5d915804fd87acb158bc797147a1719"
+ version "2.1.0"
+ resolved "https://registry.yarnpkg.com/bser/-/bser-2.1.0.tgz#65fc784bf7f87c009b973c12db6546902fa9c7b5"
+ integrity sha512-8zsjWrQkkBoLK6uxASk1nJ2SKv97ltiGDo6A3wA0/yRPz+CwmEyDo0hUrhIuukG2JHpAl3bvFIixw2/3Hi0DOg==
dependencies:
node-int64 "^0.4.0"
buffer-alloc-unsafe@^1.1.0:
version "1.1.0"
- resolved "http://registry.npm.taobao.org/buffer-alloc-unsafe/download/buffer-alloc-unsafe-1.1.0.tgz#bd7dc26ae2972d0eda253be061dba992349c19f0"
+ resolved "https://registry.yarnpkg.com/buffer-alloc-unsafe/-/buffer-alloc-unsafe-1.1.0.tgz#bd7dc26ae2972d0eda253be061dba992349c19f0"
+ integrity sha512-TEM2iMIEQdJ2yjPJoSIsldnleVaAk1oW3DBVUykyOLsEsFmEc9kn+SFFPz+gl54KQNxlDnAwCXosOS9Okx2xAg==
-buffer-alloc@^1.1.0:
+buffer-alloc@^1.2.0:
version "1.2.0"
- resolved "http://registry.npm.taobao.org/buffer-alloc/download/buffer-alloc-1.2.0.tgz#890dd90d923a873e08e10e5fd51a57e5b7cce0ec"
+ resolved "https://registry.yarnpkg.com/buffer-alloc/-/buffer-alloc-1.2.0.tgz#890dd90d923a873e08e10e5fd51a57e5b7cce0ec"
+ integrity sha512-CFsHQgjtW1UChdXgbyJGtnm+O/uLQeZdtbDo8mfUgYXCHSM1wgrVxXm6bSyrUuErEb+4sYVGCzASBRot7zyrow==
dependencies:
buffer-alloc-unsafe "^1.1.0"
buffer-fill "^1.0.0"
buffer-crc32@^0.2.1:
version "0.2.13"
- resolved "http://registry.npm.taobao.org/buffer-crc32/download/buffer-crc32-0.2.13.tgz#0d333e3f00eac50aa1454abd30ef8c2a5d9a7242"
+ resolved "https://registry.yarnpkg.com/buffer-crc32/-/buffer-crc32-0.2.13.tgz#0d333e3f00eac50aa1454abd30ef8c2a5d9a7242"
+ integrity sha1-DTM+PwDqxQqhRUq9MO+MKl2ackI=
buffer-fill@^1.0.0:
version "1.0.0"
- resolved "http://registry.npm.taobao.org/buffer-fill/download/buffer-fill-1.0.0.tgz#f8f78b76789888ef39f205cd637f68e702122b2c"
+ resolved "https://registry.yarnpkg.com/buffer-fill/-/buffer-fill-1.0.0.tgz#f8f78b76789888ef39f205cd637f68e702122b2c"
+ integrity sha1-+PeLdniYiO858gXNY39o5wISKyw=
buffer-from@^1.0.0:
- version "1.0.0"
- resolved "http://registry.npm.taobao.org/buffer-from/download/buffer-from-1.0.0.tgz#4cb8832d23612589b0406e9e2956c17f06fdf531"
+ version "1.1.1"
+ resolved "https://registry.yarnpkg.com/buffer-from/-/buffer-from-1.1.1.tgz#32713bc028f75c02fdb710d7c7bcec1f2c6070ef"
+ integrity sha512-MQcXEUbCKtEo7bhqEs6560Hyd4XaovZlO/k9V3hjVUF/zwW7KBVdSK4gIt/bzwS9MbR5qob+F5jusZsb0YQK2A==
buffer-indexof@^1.0.0:
version "1.1.1"
- resolved "http://registry.npm.taobao.org/buffer-indexof/download/buffer-indexof-1.1.1.tgz#52fabcc6a606d1a00302802648ef68f639da268c"
+ resolved "https://registry.yarnpkg.com/buffer-indexof/-/buffer-indexof-1.1.1.tgz#52fabcc6a606d1a00302802648ef68f639da268c"
+ integrity sha512-4/rOEg86jivtPTeOUUT61jJO1Ya1TrR/OkqCSZDyq84WJh3LuuiphBYJN+fm5xufIk4XAFcEwte/8WzC8If/1g==
buffer-xor@^1.0.3:
version "1.0.3"
- resolved "http://registry.npm.taobao.org/buffer-xor/download/buffer-xor-1.0.3.tgz#26e61ed1422fb70dd42e6e36729ed51d855fe8d9"
+ resolved "https://registry.yarnpkg.com/buffer-xor/-/buffer-xor-1.0.3.tgz#26e61ed1422fb70dd42e6e36729ed51d855fe8d9"
+ integrity sha1-JuYe0UIvtw3ULm42cp7VHYVf6Nk=
buffer@^4.3.0:
version "4.9.1"
- resolved "http://registry.npm.taobao.org/buffer/download/buffer-4.9.1.tgz#6d1bb601b07a4efced97094132093027c95bc298"
+ resolved "https://registry.yarnpkg.com/buffer/-/buffer-4.9.1.tgz#6d1bb601b07a4efced97094132093027c95bc298"
+ integrity sha1-bRu2AbB6TvztlwlBMgkwJ8lbwpg=
dependencies:
base64-js "^1.0.2"
ieee754 "^1.1.4"
isarray "^1.0.0"
buffer@^5.1.0:
- version "5.1.0"
- resolved "http://registry.npm.taobao.org/buffer/download/buffer-5.1.0.tgz#c913e43678c7cb7c8bd16afbcddb6c5505e8f9fe"
+ version "5.2.1"
+ resolved "https://registry.yarnpkg.com/buffer/-/buffer-5.2.1.tgz#dd57fa0f109ac59c602479044dca7b8b3d0b71d6"
+ integrity sha512-c+Ko0loDaFfuPWiL02ls9Xd3GO3cPVmUobQ6t3rXNUk304u6hGq+8N/kFi+QEIKhzK3uwolVhLzszmfLmMLnqg==
dependencies:
base64-js "^1.0.2"
ieee754 "^1.1.4"
-builtin-modules@^1.0.0, builtin-modules@^1.1.1:
- version "1.1.1"
- resolved "http://registry.npm.taobao.org/builtin-modules/download/builtin-modules-1.1.1.tgz#270f076c5a72c02f5b65a47df94c5fe3a278892f"
-
builtin-status-codes@^3.0.0:
version "3.0.0"
- resolved "http://registry.npm.taobao.org/builtin-status-codes/download/builtin-status-codes-3.0.0.tgz#85982878e21b98e1c66425e03d0174788f569ee8"
+ resolved "https://registry.yarnpkg.com/builtin-status-codes/-/builtin-status-codes-3.0.0.tgz#85982878e21b98e1c66425e03d0174788f569ee8"
+ integrity sha1-hZgoeOIbmOHGZCXgPQF0eI9Wnug=
[email protected]:
version "3.0.0"
- resolved "http://registry.npm.taobao.org/bytes/download/bytes-3.0.0.tgz#d32815404d689699f85a4ea4fa8755dd13a96048"
+ resolved "https://registry.yarnpkg.com/bytes/-/bytes-3.0.0.tgz#d32815404d689699f85a4ea4fa8755dd13a96048"
+ integrity sha1-0ygVQE1olpn4Wk6k+odV3ROpYEg=
+
[email protected]:
+ version "3.1.0"
+ resolved "https://registry.yarnpkg.com/bytes/-/bytes-3.1.0.tgz#f6cf7933a360e0588fa9fde85651cdc7f805d1f6"
+ integrity sha512-zauLjrfCG+xvoyaqLoV8bLVXXNGC4JqlxFCutSDWA6fJrTo2ZuvLYTqZ7aHBLZSMOopbzwv8f+wZcVzfVTI2Dg==
cacache@^10.0.4:
version "10.0.4"
- resolved "http://registry.npm.taobao.org/cacache/download/cacache-10.0.4.tgz#6452367999eff9d4188aefd9a14e9d7c6a263460"
+ resolved "https://registry.yarnpkg.com/cacache/-/cacache-10.0.4.tgz#6452367999eff9d4188aefd9a14e9d7c6a263460"
+ integrity sha512-Dph0MzuH+rTQzGPNT9fAnrPmMmjKfST6trxJeK7NQuHRaVw24VzPRWTmg9MpcwOVQZO0E1FBICUlFeNaKPIfHA==
dependencies:
bluebird "^3.5.1"
chownr "^1.0.1"
@@ -1664,9 +2192,30 @@ cacache@^10.0.4:
unique-filename "^1.1.0"
y18n "^4.0.0"
+cacache@^11.3.2:
+ version "11.3.3"
+ resolved "https://registry.yarnpkg.com/cacache/-/cacache-11.3.3.tgz#8bd29df8c6a718a6ebd2d010da4d7972ae3bbadc"
+ integrity sha512-p8WcneCytvzPxhDvYp31PD039vi77I12W+/KfR9S8AZbaiARFBCpsPJS+9uhWfeBfeAtW7o/4vt3MUqLkbY6nA==
+ dependencies:
+ bluebird "^3.5.5"
+ chownr "^1.1.1"
+ figgy-pudding "^3.5.1"
+ glob "^7.1.4"
+ graceful-fs "^4.1.15"
+ lru-cache "^5.1.1"
+ mississippi "^3.0.0"
+ mkdirp "^0.5.1"
+ move-concurrently "^1.0.1"
+ promise-inflight "^1.0.1"
+ rimraf "^2.6.3"
+ ssri "^6.0.1"
+ unique-filename "^1.1.1"
+ y18n "^4.0.0"
+
cache-base@^1.0.1:
version "1.0.1"
- resolved "http://registry.npm.taobao.org/cache-base/download/cache-base-1.0.1.tgz#0a7f46416831c8b662ee36fe4e7c59d76f666ab2"
+ resolved "https://registry.yarnpkg.com/cache-base/-/cache-base-1.0.1.tgz#0a7f46416831c8b662ee36fe4e7c59d76f666ab2"
+ integrity sha512-AKcdTnFSWATd5/GCPRxr2ChwIJ85CeyrEyjRHlKxQ56d4XJMGym0uAiKn0xbLOGOl3+yRpOTi484dVCEc5AUzQ==
dependencies:
collection-visit "^1.0.0"
component-emitter "^1.2.1"
@@ -1678,11 +2227,10 @@ cache-base@^1.0.1:
union-value "^1.0.0"
unset-value "^1.0.0"
-cachedir@^1.1.0:
- version "1.2.0"
- resolved "http://registry.npm.taobao.org/cachedir/download/cachedir-1.2.0.tgz#e9a0a25bb21a2b7a0f766f07c41eb7a311919b97"
- dependencies:
- os-homedir "^1.0.1"
[email protected]:
+ version "2.1.0"
+ resolved "https://registry.yarnpkg.com/cachedir/-/cachedir-2.1.0.tgz#b448c32b44cd9c0cd6ce4c419fa5b3c112c02191"
+ integrity sha512-xGBpPqoBvn3unBW7oxgb8aJn42K0m9m1/wyjmazah10Fq7bROGG3kRAE6OIyr3U3PIJUqGuebhCEdMk9OKJG0A==
caller-callsite@^2.0.0:
version "2.0.0"
@@ -1691,12 +2239,6 @@ caller-callsite@^2.0.0:
dependencies:
callsites "^2.0.0"
-caller-path@^0.1.0:
- version "0.1.0"
- resolved "http://registry.npm.taobao.org/caller-path/download/caller-path-0.1.0.tgz#94085ef63581ecd3daa92444a8fe94e82577751f"
- dependencies:
- callsites "^0.2.0"
-
caller-path@^2.0.0:
version "2.0.0"
resolved "https://registry.yarnpkg.com/caller-path/-/caller-path-2.0.0.tgz#468f83044e369ab2010fac5f06ceee15bb2cb1f4"
@@ -1704,623 +2246,532 @@ caller-path@^2.0.0:
dependencies:
caller-callsite "^2.0.0"
-callsites@^0.2.0:
- version "0.2.0"
- resolved "http://registry.npm.taobao.org/callsites/download/callsites-0.2.0.tgz#afab96262910a7f33c19a5775825c69f34e350ca"
-
callsites@^2.0.0:
version "2.0.0"
- resolved "http://registry.npm.taobao.org/callsites/download/callsites-2.0.0.tgz#06eb84f00eea413da86affefacbffb36093b3c50"
+ resolved "https://registry.yarnpkg.com/callsites/-/callsites-2.0.0.tgz#06eb84f00eea413da86affefacbffb36093b3c50"
+ integrity sha1-BuuE8A7qQT2oav/vrL/7Ngk7PFA=
+
+callsites@^3.0.0:
+ version "3.1.0"
+ resolved "https://registry.yarnpkg.com/callsites/-/callsites-3.1.0.tgz#b3630abd8943432f54b3f0519238e33cd7df2f73"
+ integrity sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==
[email protected]:
version "3.0.0"
- resolved "http://registry.npm.taobao.org/camel-case/download/camel-case-3.0.0.tgz#ca3c3688a4e9cf3a4cda777dc4dcbc713249cf73"
+ resolved "https://registry.yarnpkg.com/camel-case/-/camel-case-3.0.0.tgz#ca3c3688a4e9cf3a4cda777dc4dcbc713249cf73"
+ integrity sha1-yjw2iKTpzzpM2nd9xNy8cTJJz3M=
dependencies:
no-case "^2.2.0"
upper-case "^1.1.1"
camelcase-keys@^2.0.0:
version "2.1.0"
- resolved "http://registry.npm.taobao.org/camelcase-keys/download/camelcase-keys-2.1.0.tgz#308beeaffdf28119051efa1d932213c91b8f92e7"
+ resolved "https://registry.yarnpkg.com/camelcase-keys/-/camelcase-keys-2.1.0.tgz#308beeaffdf28119051efa1d932213c91b8f92e7"
+ integrity sha1-MIvur/3ygRkFHvodkyITyRuPkuc=
dependencies:
camelcase "^2.0.0"
map-obj "^1.0.0"
camelcase-keys@^4.0.0:
version "4.2.0"
- resolved "http://registry.npm.taobao.org/camelcase-keys/download/camelcase-keys-4.2.0.tgz#a2aa5fb1af688758259c32c141426d78923b9b77"
+ resolved "https://registry.yarnpkg.com/camelcase-keys/-/camelcase-keys-4.2.0.tgz#a2aa5fb1af688758259c32c141426d78923b9b77"
+ integrity sha1-oqpfsa9oh1glnDLBQUJteJI7m3c=
dependencies:
camelcase "^4.1.0"
map-obj "^2.0.0"
quick-lru "^1.0.0"
-camelcase@^1.0.2:
- version "1.2.1"
- resolved "http://registry.npm.taobao.org/camelcase/download/camelcase-1.2.1.tgz#9bb5304d2e0b56698b2c758b08a3eaa9daa58a39"
-
camelcase@^2.0.0:
version "2.1.1"
- resolved "http://registry.npm.taobao.org/camelcase/download/camelcase-2.1.1.tgz#7c1d16d679a1bbe59ca02cacecfb011e201f5a1f"
-
-camelcase@^3.0.0:
- version "3.0.0"
- resolved "http://registry.npm.taobao.org/camelcase/download/camelcase-3.0.0.tgz#32fc4b9fcdaf845fcdf7e73bb97cac2261f0ab0a"
+ resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-2.1.1.tgz#7c1d16d679a1bbe59ca02cacecfb011e201f5a1f"
+ integrity sha1-fB0W1nmhu+WcoCys7PsBHiAfWh8=
camelcase@^4.1.0:
- version "4.1.0"
- resolved "http://registry.npm.taobao.org/camelcase/download/camelcase-4.1.0.tgz#d545635be1e33c542649c69173e5de6acfae34dd"
-
-caniuse-api@^1.5.2:
- version "1.6.1"
- resolved "http://registry.npm.taobao.org/caniuse-api/download/caniuse-api-1.6.1.tgz#b534e7c734c4f81ec5fbe8aca2ad24354b962c6c"
- dependencies:
- browserslist "^1.3.6"
- caniuse-db "^1.0.30000529"
- lodash.memoize "^4.1.2"
- lodash.uniq "^4.5.0"
+ version "4.1.0"
+ resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-4.1.0.tgz#d545635be1e33c542649c69173e5de6acfae34dd"
+ integrity sha1-1UVjW+HjPFQmScaRc+Xeas+uNN0=
-caniuse-db@^1.0.30000529, caniuse-db@^1.0.30000634, caniuse-db@^1.0.30000639:
- version "1.0.30000846"
- resolved "http://registry.npm.taobao.org/caniuse-db/download/caniuse-db-1.0.30000846.tgz#d9c86f914738db4da098eeded997413c44561bd2"
+camelcase@^5.0.0, camelcase@^5.2.0:
+ version "5.3.1"
+ resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-5.3.1.tgz#e3c9b31569e106811df242f715725a1f4c494320"
+ integrity sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==
-caniuse-lite@^1.0.30000810, caniuse-lite@^1.0.30000844:
- version "1.0.30000846"
- resolved "http://registry.npm.taobao.org/caniuse-lite/download/caniuse-lite-1.0.30000846.tgz#2092911eecad71a89dae1faa62bcc202fde7f959"
+caniuse-lite@^1.0.30000975:
+ version "1.0.30000979"
+ resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30000979.tgz#92f16d00186a6cf20d6c5711bb6e042a3d667029"
+ integrity sha512-gcu45yfq3B7Y+WB05fOMfr0EiSlq+1u+m6rPHyJli/Wy3PVQNGaU7VA4bZE5qw+AU2UVOBR/N5g1bzADUqdvFw==
-capture-exit@^1.2.0:
- version "1.2.0"
- resolved "http://registry.npm.taobao.org/capture-exit/download/capture-exit-1.2.0.tgz#1c5fcc489fd0ab00d4f1ac7ae1072e3173fbab6f"
+capture-exit@^2.0.0:
+ version "2.0.0"
+ resolved "https://registry.yarnpkg.com/capture-exit/-/capture-exit-2.0.0.tgz#fb953bfaebeb781f62898239dabb426d08a509a4"
+ integrity sha512-PiT/hQmTonHhl/HFGN+Lx3JJUznrVYJ3+AQsnthneZbvW7x+f08Tk7yLJTLEOUvBTbduLeeBkxEaYXUOUrRq6g==
dependencies:
- rsvp "^3.3.3"
-
[email protected]:
- version "2.1.2"
- resolved "http://registry.npm.taobao.org/case-sensitive-paths-webpack-plugin/download/case-sensitive-paths-webpack-plugin-2.1.2.tgz#c899b52175763689224571dad778742e133f0192"
-
-caseless@~0.11.0:
- version "0.11.0"
- resolved "http://registry.npm.taobao.org/caseless/download/caseless-0.11.0.tgz#715b96ea9841593cc33067923f5ec60ebda4f7d7"
+ rsvp "^4.8.4"
caseless@~0.12.0:
version "0.12.0"
- resolved "http://registry.npm.taobao.org/caseless/download/caseless-0.12.0.tgz#1b681c21ff84033c826543090689420d187151dc"
-
-center-align@^0.1.1:
- version "0.1.3"
- resolved "http://registry.npm.taobao.org/center-align/download/center-align-0.1.3.tgz#aa0d32629b6ee972200411cbd4461c907bc2b7ad"
- dependencies:
- align-text "^0.1.3"
- lazy-cache "^1.0.3"
-
[email protected], chalk@^1.0.0, chalk@^1.1.1, chalk@^1.1.3:
- version "1.1.3"
- resolved "http://registry.npm.taobao.org/chalk/download/chalk-1.1.3.tgz#a8115c55e4a702fe4d150abd3872822a7e09fc98"
- dependencies:
- ansi-styles "^2.2.1"
- escape-string-regexp "^1.0.2"
- has-ansi "^2.0.0"
- strip-ansi "^3.0.0"
- supports-color "^2.0.0"
+ resolved "https://registry.yarnpkg.com/caseless/-/caseless-0.12.0.tgz#1b681c21ff84033c826543090689420d187151dc"
+ integrity sha1-G2gcIf+EAzyCZUMJBolCDRhxUdw=
[email protected]:
version "2.3.1"
- resolved "http://registry.npm.taobao.org/chalk/download/chalk-2.3.1.tgz#523fe2678aec7b04e8041909292fe8b17059b796"
+ resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.3.1.tgz#523fe2678aec7b04e8041909292fe8b17059b796"
+ integrity sha512-QUU4ofkDoMIVO7hcx1iPTISs88wsO8jA92RQIm4JAwZvFGGAV2hSAA1NX7oVj2Ej2Q6NDTcRDjPTFrMCRZoJ6g==
dependencies:
ansi-styles "^3.2.0"
escape-string-regexp "^1.0.5"
supports-color "^5.2.0"
[email protected]:
- version "2.3.2"
- resolved "http://registry.npm.taobao.org/chalk/download/chalk-2.3.2.tgz#250dc96b07491bfd601e648d66ddf5f60c7a5c65"
- dependencies:
- ansi-styles "^3.2.1"
- escape-string-regexp "^1.0.5"
- supports-color "^5.3.0"
-
-chalk@^2.0.0, chalk@^2.0.1, chalk@^2.3.0, chalk@^2.4.1:
- version "2.4.1"
- resolved "http://registry.npm.taobao.org/chalk/download/chalk-2.4.1.tgz#18c49ab16a037b6eb0152cc83e3471338215b66e"
[email protected], chalk@^2.0.0, chalk@^2.0.1, chalk@^2.1.0, chalk@^2.4.2:
+ version "2.4.2"
+ resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.4.2.tgz#cd42541677a54333cf541a49108c1432b44c9424"
+ integrity sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==
dependencies:
ansi-styles "^3.2.1"
escape-string-regexp "^1.0.5"
supports-color "^5.3.0"
-chardet@^0.4.0:
- version "0.4.2"
- resolved "http://registry.npm.taobao.org/chardet/download/chardet-0.4.2.tgz#b5473b33dc97c424e5d98dc87d55d4d8a29c8bf2"
-
-charenc@~0.0.1:
- version "0.0.2"
- resolved "https://registry.yarnpkg.com/charenc/-/charenc-0.0.2.tgz#c0a1d2f3a7092e03774bfa83f14c0fc5790a8667"
-
-check-types@^7.3.0:
- version "7.3.0"
- resolved "http://registry.npm.taobao.org/check-types/download/check-types-7.3.0.tgz#468f571a4435c24248f5fd0cb0e8d87c3c341e7d"
-
-cheerio@^1.0.0-rc.2:
- version "1.0.0-rc.2"
- resolved "http://registry.npm.taobao.org/cheerio/download/cheerio-1.0.0-rc.2.tgz#4b9f53a81b27e4d5dac31c0ffd0cfa03cc6830db"
- dependencies:
- css-select "~1.2.0"
- dom-serializer "~0.1.0"
- entities "~1.1.1"
- htmlparser2 "^3.9.1"
- lodash "^4.15.0"
- parse5 "^3.0.1"
-
-chokidar@^1.6.0, chokidar@^1.7.0:
- version "1.7.0"
- resolved "http://registry.npm.taobao.org/chokidar/download/chokidar-1.7.0.tgz#798e689778151c8076b4b360e5edd28cda2bb468"
- dependencies:
- anymatch "^1.3.0"
- async-each "^1.0.0"
- glob-parent "^2.0.0"
- inherits "^2.0.1"
- is-binary-path "^1.0.0"
- is-glob "^2.0.0"
- path-is-absolute "^1.0.0"
- readdirp "^2.0.0"
- optionalDependencies:
- fsevents "^1.0.0"
+chardet@^0.7.0:
+ version "0.7.0"
+ resolved "https://registry.yarnpkg.com/chardet/-/chardet-0.7.0.tgz#90094849f0937f2eedc2425d0d28a9e5f0cbad9e"
+ integrity sha512-mT8iDcrh03qDGRRmoA2hmBJnxpllMR+0/0qlzjqZES6NdiWDcZkCNAk4rPFZ9Q85r27unkiNNg8ZOiwZXBHwcA==
-chokidar@^2.0.0, chokidar@^2.0.2:
- version "2.0.3"
- resolved "http://registry.npm.taobao.org/chokidar/download/chokidar-2.0.3.tgz#dcbd4f6cbb2a55b4799ba8a840ac527e5f4b1176"
+chokidar@^2.0.2, chokidar@^2.1.6:
+ version "2.1.6"
+ resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-2.1.6.tgz#b6cad653a929e244ce8a834244164d241fa954c5"
+ integrity sha512-V2jUo67OKkc6ySiRpJrjlpJKl9kDuG+Xb8VgsGzb+aEouhgS1D0weyPU4lEzdAcsCAvrih2J2BqyXqHWvVLw5g==
dependencies:
anymatch "^2.0.0"
- async-each "^1.0.0"
- braces "^2.3.0"
+ async-each "^1.0.1"
+ braces "^2.3.2"
glob-parent "^3.1.0"
- inherits "^2.0.1"
+ inherits "^2.0.3"
is-binary-path "^1.0.0"
is-glob "^4.0.0"
- normalize-path "^2.1.1"
+ normalize-path "^3.0.0"
path-is-absolute "^1.0.0"
- readdirp "^2.0.0"
- upath "^1.0.0"
+ readdirp "^2.2.1"
+ upath "^1.1.1"
optionalDependencies:
- fsevents "^1.1.2"
+ fsevents "^1.2.7"
-chownr@^1.0.1:
- version "1.0.1"
- resolved "http://registry.npm.taobao.org/chownr/download/chownr-1.0.1.tgz#e2a75042a9551908bebd25b8523d5f9769d79181"
+chownr@^1.0.1, chownr@^1.1.1:
+ version "1.1.2"
+ resolved "https://registry.yarnpkg.com/chownr/-/chownr-1.1.2.tgz#a18f1e0b269c8a6a5d3c86eb298beb14c3dd7bf6"
+ integrity sha512-GkfeAQh+QNy3wquu9oIZr6SS5x7wGdSgNQvD10X3r+AZr1Oys22HW8kAmDMvNg2+Dm0TeGaEuO8gFwdBXxwO8A==
-ci-info@^1.0.0:
- version "1.1.3"
- resolved "http://registry.npm.taobao.org/ci-info/download/ci-info-1.1.3.tgz#710193264bb05c77b8c90d02f5aaf22216a667b2"
+chrome-trace-event@^1.0.0:
+ version "1.0.2"
+ resolved "https://registry.yarnpkg.com/chrome-trace-event/-/chrome-trace-event-1.0.2.tgz#234090ee97c7d4ad1a2c4beae27505deffc608a4"
+ integrity sha512-9e/zx1jw7B4CO+c/RXoCsfg/x1AfUBioy4owYH0bJprEYAx5hRFLRhWBqHAG57D0ZM4H7vxbP7bPe0VwhQRYDQ==
+ dependencies:
+ tslib "^1.9.0"
-ci-info@^1.5.0:
- version "1.6.0"
- resolved "https://registry.yarnpkg.com/ci-info/-/ci-info-1.6.0.tgz#2ca20dbb9ceb32d4524a683303313f0304b1e497"
- integrity sha512-vsGdkwSCDpWmP80ncATX7iea5DWQemg1UgCW5J8tqjU3lYw4FBYuj89J0CTVomA7BEfvSZd84GmHko+MxFQU2A==
+ci-info@^2.0.0:
+ version "2.0.0"
+ resolved "https://registry.yarnpkg.com/ci-info/-/ci-info-2.0.0.tgz#67a9e964be31a51e15e5010d58e6f12834002f46"
+ integrity sha512-5tK7EtrZ0N+OLFMthtqOj4fI2Jeb88C4CAZPu25LDVUgXJ0A3Js4PMGqrn0JU1W0Mh1/Z8wZzYPxqUrXeBboCQ==
cipher-base@^1.0.0, cipher-base@^1.0.1, cipher-base@^1.0.3:
version "1.0.4"
- resolved "http://registry.npm.taobao.org/cipher-base/download/cipher-base-1.0.4.tgz#8760e4ecc272f4c363532f926d874aae2c1397de"
+ resolved "https://registry.yarnpkg.com/cipher-base/-/cipher-base-1.0.4.tgz#8760e4ecc272f4c363532f926d874aae2c1397de"
+ integrity sha512-Kkht5ye6ZGmwv40uUDZztayT2ThLQGfnj/T71N/XzeZeo3nf8foyW7zGTsPYkEya3m5f3cAypH+qe7YOrM1U2Q==
dependencies:
inherits "^2.0.1"
safe-buffer "^5.0.1"
-clamp@^1.0.1:
- version "1.0.1"
- resolved "https://registry.npm.taobao.org/clamp/download/clamp-1.0.1.tgz#66a0e64011816e37196828fdc8c8c147312c8634"
- integrity sha1-ZqDmQBGBbjcZaCj9yMjBRzEshjQ=
-
-clap@^1.0.9:
- version "1.2.3"
- resolved "http://registry.npm.taobao.org/clap/download/clap-1.2.3.tgz#4f36745b32008492557f46412d66d50cb99bce51"
- dependencies:
- chalk "^1.1.3"
-
class-utils@^0.3.5:
version "0.3.6"
- resolved "http://registry.npm.taobao.org/class-utils/download/class-utils-0.3.6.tgz#f93369ae8b9a7ce02fd41faad0ca83033190c463"
+ resolved "https://registry.yarnpkg.com/class-utils/-/class-utils-0.3.6.tgz#f93369ae8b9a7ce02fd41faad0ca83033190c463"
+ integrity sha512-qOhPa/Fj7s6TY8H8esGu5QNpMMQxz79h+urzrNYN6mn+9BnxlDGf5QZ+XeCDsxSjPqsSR56XOZOJmpeurnLMeg==
dependencies:
arr-union "^3.1.0"
define-property "^0.2.5"
isobject "^3.0.0"
static-extend "^0.1.1"
[email protected], classnames@^2.2.0, classnames@^2.2.1, classnames@^2.2.3, classnames@^2.2.5:
- version "2.2.5"
- resolved "http://registry.npm.taobao.org/classnames/download/classnames-2.2.5.tgz#fb3801d453467649ef3603c7d61a02bd129bde6d"
-
-classnames@^2.2.6, classnames@~2.2.0:
- version "2.2.6"
- resolved "http://registry.npm.taobao.org/classnames/download/classnames-2.2.6.tgz#43935bffdd291f326dad0a205309b38d00f650ce"
- integrity sha1-Q5Nb/90pHzJtrQogUwmzjQD2UM4=
-
[email protected]:
- version "4.1.11"
- resolved "http://registry.npm.taobao.org/clean-css/download/clean-css-4.1.11.tgz#2ecdf145aba38f54740f26cefd0ff3e03e125d6a"
[email protected]:
+ version "4.2.1"
+ resolved "https://registry.yarnpkg.com/clean-css/-/clean-css-4.2.1.tgz#2d411ef76b8569b6d0c84068dabe85b0aa5e5c17"
+ integrity sha512-4ZxI6dy4lrY6FHzfiy1aEOXgu4LIsW2MhwG0VBKdcoGoH/XLFgaHSdLTGr4O8Be6A8r3MOphEiI8Gc1n0ecf3g==
dependencies:
- source-map "0.5.x"
+ source-map "~0.6.0"
-cli-cursor@^1.0.1:
- version "1.0.2"
- resolved "http://registry.npm.taobao.org/cli-cursor/download/cli-cursor-1.0.2.tgz#64da3f7d56a54412e59794bd62dc35295e8f2987"
+clean-webpack-plugin@^2.0.1:
+ version "2.0.2"
+ resolved "https://registry.yarnpkg.com/clean-webpack-plugin/-/clean-webpack-plugin-2.0.2.tgz#805a19ff20d46a06125298a25eb31142ecad2166"
+ integrity sha512-pi1111o4OBd9qvacbgs+NRqClfVPKVIc66B4d8kx6Ho/L+i9entQ/NpK600CsTYTPu3kWvKwwyKarsYMvC2xeA==
dependencies:
- restore-cursor "^1.0.1"
+ del "^4.0.0"
cli-cursor@^2.1.0:
version "2.1.0"
- resolved "http://registry.npm.taobao.org/cli-cursor/download/cli-cursor-2.1.0.tgz#b35dac376479facc3e94747d41d0d0f5238ffcb5"
+ resolved "https://registry.yarnpkg.com/cli-cursor/-/cli-cursor-2.1.0.tgz#b35dac376479facc3e94747d41d0d0f5238ffcb5"
+ integrity sha1-s12sN2R5+sw+lHR9QdDQ9SOP/LU=
dependencies:
restore-cursor "^2.0.0"
cli-width@^2.0.0:
version "2.2.0"
- resolved "http://registry.npm.taobao.org/cli-width/download/cli-width-2.2.0.tgz#ff19ede8a9a5e579324147b0c11f0fbcbabed639"
-
-cliui@^2.1.0:
- version "2.1.0"
- resolved "http://registry.npm.taobao.org/cliui/download/cliui-2.1.0.tgz#4b475760ff80264c762c3a1719032e91c7fea0d1"
- dependencies:
- center-align "^0.1.1"
- right-align "^0.1.1"
- wordwrap "0.0.2"
-
-cliui@^3.2.0:
- version "3.2.0"
- resolved "http://registry.npm.taobao.org/cliui/download/cliui-3.2.0.tgz#120601537a916d29940f934da3b48d585a39213d"
- dependencies:
- string-width "^1.0.1"
- strip-ansi "^3.0.1"
- wrap-ansi "^2.0.0"
+ resolved "https://registry.yarnpkg.com/cli-width/-/cli-width-2.2.0.tgz#ff19ede8a9a5e579324147b0c11f0fbcbabed639"
+ integrity sha1-/xnt6Kml5XkyQUewwR8PvLq+1jk=
cliui@^4.0.0:
version "4.1.0"
- resolved "http://registry.npm.taobao.org/cliui/download/cliui-4.1.0.tgz#348422dbe82d800b3022eef4f6ac10bf2e4d1b49"
+ resolved "https://registry.yarnpkg.com/cliui/-/cliui-4.1.0.tgz#348422dbe82d800b3022eef4f6ac10bf2e4d1b49"
+ integrity sha512-4FG+RSG9DL7uEwRUZXZn3SS34DiDPfzP0VOiEwtUWlE+AR2EIg+hSyvrIgUUfhdgR/UkAeW2QHgeP+hWrXs7jQ==
dependencies:
string-width "^2.1.1"
strip-ansi "^4.0.0"
wrap-ansi "^2.0.0"
-clone-deep@^2.0.1:
- version "2.0.2"
- resolved "http://registry.npm.taobao.org/clone-deep/download/clone-deep-2.0.2.tgz#00db3a1e173656730d1188c3d6aced6d7ea97713"
+cliui@^5.0.0:
+ version "5.0.0"
+ resolved "https://registry.yarnpkg.com/cliui/-/cliui-5.0.0.tgz#deefcfdb2e800784aa34f46fa08e06851c7bbbc5"
+ integrity sha512-PYeGSEmmHM6zvoef2w8TPzlrnNpXIjTipYK780YswmIP9vjxmd6Y2a3CB2Ks6/AU8NHjZugXvo8w3oWM2qnwXA==
dependencies:
- for-own "^1.0.0"
- is-plain-object "^2.0.4"
- kind-of "^6.0.0"
- shallow-clone "^1.0.0"
-
-clone@^1.0.2:
- version "1.0.4"
- resolved "http://registry.npm.taobao.org/clone/download/clone-1.0.4.tgz#da309cc263df15994c688ca902179ca3c7cd7c7e"
+ string-width "^3.1.0"
+ strip-ansi "^5.2.0"
+ wrap-ansi "^5.1.0"
co@^4.6.0:
version "4.6.0"
- resolved "http://registry.npm.taobao.org/co/download/co-4.6.0.tgz#6ea6bdf3d853ae54ccb8e47bfa0bf3f9031fb184"
-
-coa@~1.0.1:
- version "1.0.4"
- resolved "http://registry.npm.taobao.org/coa/download/coa-1.0.4.tgz#a9ef153660d6a86a8bdec0289a5c684d217432fd"
- dependencies:
- q "^1.1.2"
+ resolved "https://registry.yarnpkg.com/co/-/co-4.6.0.tgz#6ea6bdf3d853ae54ccb8e47bfa0bf3f9031fb184"
+ integrity sha1-bqa989hTrlTMuOR7+gvz+QMfsYQ=
code-point-at@^1.0.0:
version "1.1.0"
- resolved "http://registry.npm.taobao.org/code-point-at/download/code-point-at-1.1.0.tgz#0d070b4d043a5bea33a2f1a40e2edb3d9a4ccf77"
+ resolved "https://registry.yarnpkg.com/code-point-at/-/code-point-at-1.1.0.tgz#0d070b4d043a5bea33a2f1a40e2edb3d9a4ccf77"
+ integrity sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c=
collection-visit@^1.0.0:
version "1.0.0"
- resolved "http://registry.npm.taobao.org/collection-visit/download/collection-visit-1.0.0.tgz#4bc0373c164bc3291b4d368c829cf1a80a59dca0"
+ resolved "https://registry.yarnpkg.com/collection-visit/-/collection-visit-1.0.0.tgz#4bc0373c164bc3291b4d368c829cf1a80a59dca0"
+ integrity sha1-S8A3PBZLwykbTTaMgpzxqApZ3KA=
dependencies:
map-visit "^1.0.0"
object-visit "^1.0.0"
-color-convert@^1.3.0, color-convert@^1.9.0:
- version "1.9.1"
- resolved "http://registry.npm.taobao.org/color-convert/download/color-convert-1.9.1.tgz#c1261107aeb2f294ebffec9ed9ecad529a6097ed"
+color-convert@^1.9.0:
+ version "1.9.3"
+ resolved "https://registry.yarnpkg.com/color-convert/-/color-convert-1.9.3.tgz#bb71850690e1f136567de629d2d5471deda4c1e8"
+ integrity sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==
dependencies:
- color-name "^1.1.1"
+ color-name "1.1.3"
-color-name@^1.0.0, color-name@^1.1.1:
[email protected]:
version "1.1.3"
- resolved "http://registry.npm.taobao.org/color-name/download/color-name-1.1.3.tgz#a7d0558bd89c42f795dd42328f740831ca53bc25"
+ resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.3.tgz#a7d0558bd89c42f795dd42328f740831ca53bc25"
+ integrity sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=
-color-string@^0.3.0:
- version "0.3.0"
- resolved "http://registry.npm.taobao.org/color-string/download/color-string-0.3.0.tgz#27d46fb67025c5c2fa25993bfbf579e47841b991"
- dependencies:
- color-name "^1.0.0"
-
-color@^0.11.0:
- version "0.11.4"
- resolved "http://registry.npm.taobao.org/color/download/color-0.11.4.tgz#6d7b5c74fb65e841cd48792ad1ed5e07b904d764"
- dependencies:
- clone "^1.0.2"
- color-convert "^1.3.0"
- color-string "^0.3.0"
-
-colormin@^1.0.5:
- version "1.1.2"
- resolved "http://registry.npm.taobao.org/colormin/download/colormin-1.1.2.tgz#ea2f7420a72b96881a38aae59ec124a6f7298133"
+combined-stream@^1.0.6, combined-stream@~1.0.6:
+ version "1.0.8"
+ resolved "https://registry.yarnpkg.com/combined-stream/-/combined-stream-1.0.8.tgz#c3d45a8b34fd730631a110a8a2520682b31d5a7f"
+ integrity sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==
dependencies:
- color "^0.11.0"
- css-color-names "0.0.4"
- has "^1.0.1"
-
[email protected]:
- version "0.5.1"
- resolved "http://registry.npm.taobao.org/colors/download/colors-0.5.1.tgz#7d0023eaeb154e8ee9fce75dcb923d0ed1667774"
-
-colors@^1.1.2:
- version "1.3.0"
- resolved "http://registry.npm.taobao.org/colors/download/colors-1.3.0.tgz#5f20c9fef6945cb1134260aab33bfbdc8295e04e"
+ delayed-stream "~1.0.0"
-colors@~1.1.2:
- version "1.1.2"
- resolved "http://registry.npm.taobao.org/colors/download/colors-1.1.2.tgz#168a4701756b6a7f51a12ce0c97bfa28c084ed63"
[email protected]:
+ version "2.17.1"
+ resolved "https://registry.yarnpkg.com/commander/-/commander-2.17.1.tgz#bd77ab7de6de94205ceacc72f1716d29f20a77bf"
+ integrity sha512-wPMUt6FnH2yzG95SA6mzjQOEKUU3aLaDEmzs1ti+1E9h+CsrZghRlqEM/EJ4KscsQVG8uNN4uVreUeT8+drlgg==
[email protected], combined-stream@^1.0.5, combined-stream@~1.0.5:
- version "1.0.6"
- resolved "http://registry.npm.taobao.org/combined-stream/download/combined-stream-1.0.6.tgz#723e7df6e801ac5613113a7e445a9b69cb632818"
- dependencies:
- delayed-stream "~1.0.0"
+commander@^2.19.0, commander@~2.20.0:
+ version "2.20.0"
+ resolved "https://registry.yarnpkg.com/commander/-/commander-2.20.0.tgz#d58bb2b5c1ee8f87b0d340027e9e94e222c5a422"
+ integrity sha512-7j2y+40w61zy6YC2iRNpUe/NwhNyoXrYpHMrSunaMG64nRnaf96zO/KMQR4OyN/UnE5KLyEBnKHd4aG3rskjpQ==
-combined-stream@^1.0.6:
- version "1.0.7"
- resolved "http://registry.npm.taobao.org/combined-stream/download/combined-stream-1.0.7.tgz#2d1d24317afb8abe95d6d2c0b07b57813539d828"
- integrity sha1-LR0kMXr7ir6V1tLAsHtXgTU52Cg=
- dependencies:
- delayed-stream "~1.0.0"
+commander@~2.19.0:
+ version "2.19.0"
+ resolved "https://registry.yarnpkg.com/commander/-/commander-2.19.0.tgz#f6198aa84e5b83c46054b94ddedbfed5ee9ff12a"
+ integrity sha512-6tvAOO+D6OENvRAh524Dh9jcfKTYDQAqvqezbCW82xj5X0pSrcpxtvRKHLG0yBY6SD7PSDrJaj+0AiOcKVd1Xg==
[email protected], commander@^2.12.1, commander@^2.13.0, commander@^2.9.0, commander@~2.15.0:
- version "2.15.1"
- resolved "http://registry.npm.taobao.org/commander/download/commander-2.15.1.tgz#df46e867d0fc2aec66a34662b406a9ccafff5b0f"
-
-commander@~2.13.0:
- version "2.13.0"
- resolved "http://registry.npm.taobao.org/commander/download/commander-2.13.0.tgz#6964bca67685df7c1f1430c584f07d7597885b9c"
-
-commitizen@^2.9.6:
- version "2.10.1"
- resolved "http://registry.npm.taobao.org/commitizen/download/commitizen-2.10.1.tgz#8c395def34a895f4e94952c2efc3c9eb4c3683bd"
- dependencies:
- cachedir "^1.1.0"
- chalk "1.1.3"
- cz-conventional-changelog "2.0.0"
- dedent "0.6.0"
- detect-indent "4.0.0"
- find-node-modules "1.0.4"
- find-root "1.0.0"
- fs-extra "^1.0.0"
- glob "7.1.1"
- inquirer "1.2.3"
- lodash "4.17.5"
+commitizen@^3.1.1:
+ version "3.1.1"
+ resolved "https://registry.yarnpkg.com/commitizen/-/commitizen-3.1.1.tgz#0135c8c68df52ce348d718f79b23eb03b8713918"
+ integrity sha512-n5pnG8sNM5a3dS3Kkh3rYr+hFdPWZlqV6pfz6KGLmWV/gsIiTqAwhTgFKkcF/paKUpfIMp0x4YZlD0xLBNTW9g==
+ dependencies:
+ cachedir "2.1.0"
+ cz-conventional-changelog "2.1.0"
+ dedent "0.7.0"
+ detect-indent "^5.0.0"
+ find-node-modules "2.0.0"
+ find-root "1.1.0"
+ fs-extra "^7.0.0"
+ glob "7.1.3"
+ inquirer "6.2.0"
+ is-utf8 "^0.2.1"
+ lodash "4.17.11"
minimist "1.2.0"
- opencollective "1.0.3"
- path-exists "2.1.0"
shelljs "0.7.6"
+ strip-bom "3.0.0"
strip-json-comments "2.0.1"
commondir@^1.0.1:
version "1.0.1"
- resolved "http://registry.npm.taobao.org/commondir/download/commondir-1.0.1.tgz#ddd800da0c66127393cca5950ea968a3aaf1253b"
+ resolved "https://registry.yarnpkg.com/commondir/-/commondir-1.0.1.tgz#ddd800da0c66127393cca5950ea968a3aaf1253b"
+ integrity sha1-3dgA2gxmEnOTzKWVDqloo6rxJTs=
compare-func@^1.3.1:
version "1.3.2"
- resolved "http://registry.npm.taobao.org/compare-func/download/compare-func-1.3.2.tgz#99dd0ba457e1f9bc722b12c08ec33eeab31fa648"
+ resolved "https://registry.yarnpkg.com/compare-func/-/compare-func-1.3.2.tgz#99dd0ba457e1f9bc722b12c08ec33eeab31fa648"
+ integrity sha1-md0LpFfh+bxyKxLAjsM+6rMfpkg=
dependencies:
array-ify "^1.0.0"
dot-prop "^3.0.0"
-compare-versions@^3.1.0:
- version "3.2.1"
- resolved "http://registry.npm.taobao.org/compare-versions/download/compare-versions-3.2.1.tgz#a49eb7689d4caaf0b6db5220173fd279614000f7"
-
[email protected], component-classes@^1.2.5, component-classes@^1.2.6:
- version "1.2.6"
- resolved "http://registry.npm.taobao.org/component-classes/download/component-classes-1.2.6.tgz#c642394c3618a4d8b0b8919efccbbd930e5cd691"
- dependencies:
- component-indexof "0.0.3"
-
component-emitter@^1.2.1:
- version "1.2.1"
- resolved "http://registry.npm.taobao.org/component-emitter/download/component-emitter-1.2.1.tgz#137918d6d78283f7df7a6b7c5a63e140e69425e6"
-
[email protected]:
- version "0.0.3"
- resolved "http://registry.npm.taobao.org/component-indexof/download/component-indexof-0.0.3.tgz#11d091312239eb8f32c8f25ae9cb002ffe8d3c24"
+ version "1.3.0"
+ resolved "https://registry.yarnpkg.com/component-emitter/-/component-emitter-1.3.0.tgz#16e4070fba8ae29b679f2215853ee181ab2eabc0"
+ integrity sha512-Rd3se6QB+sO1TwqZjscQrurpEPIfO0/yYnSin6Q/rD3mOutHvUrCAhJub3r90uNb+SESBuE0QYoB90YdfatsRg==
compress-commons@^1.2.0:
version "1.2.2"
- resolved "http://registry.npm.taobao.org/compress-commons/download/compress-commons-1.2.2.tgz#524a9f10903f3a813389b0225d27c48bb751890f"
+ resolved "https://registry.yarnpkg.com/compress-commons/-/compress-commons-1.2.2.tgz#524a9f10903f3a813389b0225d27c48bb751890f"
+ integrity sha1-UkqfEJA/OoEzibAiXSfEi7dRiQ8=
dependencies:
buffer-crc32 "^0.2.1"
crc32-stream "^2.0.0"
normalize-path "^2.0.0"
readable-stream "^2.0.0"
-compressible@~2.0.13:
- version "2.0.13"
- resolved "http://registry.npm.taobao.org/compressible/download/compressible-2.0.13.tgz#0d1020ab924b2fdb4d6279875c7d6daba6baa7a9"
+compressible@~2.0.16:
+ version "2.0.17"
+ resolved "https://registry.yarnpkg.com/compressible/-/compressible-2.0.17.tgz#6e8c108a16ad58384a977f3a482ca20bff2f38c1"
+ integrity sha512-BGHeLCK1GV7j1bSmQQAi26X+GgWcTjLr/0tzSvMCl3LH1w1IJ4PFSPoV5316b30cneTziC+B1a+3OjoSUcQYmw==
dependencies:
- mime-db ">= 1.33.0 < 2"
+ mime-db ">= 1.40.0 < 2"
-compression@^1.5.2:
- version "1.7.2"
- resolved "http://registry.npm.taobao.org/compression/download/compression-1.7.2.tgz#aaffbcd6aaf854b44ebb280353d5ad1651f59a69"
+compression@^1.7.4:
+ version "1.7.4"
+ resolved "https://registry.yarnpkg.com/compression/-/compression-1.7.4.tgz#95523eff170ca57c29a0ca41e6fe131f41e5bb8f"
+ integrity sha512-jaSIDzP9pZVS4ZfQ+TzvtiWhdpFhE2RDHz8QJkpX9SIpLq88VueF5jJw6t+6CUQcAoA6t+x89MLrWAqpfDE8iQ==
dependencies:
- accepts "~1.3.4"
+ accepts "~1.3.5"
bytes "3.0.0"
- compressible "~2.0.13"
+ compressible "~2.0.16"
debug "2.6.9"
- on-headers "~1.0.1"
- safe-buffer "5.1.1"
+ on-headers "~1.0.2"
+ safe-buffer "5.1.2"
vary "~1.1.2"
[email protected]:
version "0.0.1"
- resolved "http://registry.npm.taobao.org/concat-map/download/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b"
+ resolved "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b"
+ integrity sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=
-concat-stream@^1.4.10, concat-stream@^1.4.7, concat-stream@^1.5.0:
+concat-stream@^1.5.0:
version "1.6.2"
- resolved "http://registry.npm.taobao.org/concat-stream/download/concat-stream-1.6.2.tgz#904bdf194cd3122fc675c77fc4ac3d4ff0fd1a34"
+ resolved "https://registry.yarnpkg.com/concat-stream/-/concat-stream-1.6.2.tgz#904bdf194cd3122fc675c77fc4ac3d4ff0fd1a34"
+ integrity sha512-27HBghJxjiZtIk3Ycvn/4kbJk/1uZuJFfuPEns6LaEvpvG1f0hTea8lilrouyo9mVc2GWdcEZ8OLoGmSADlrCw==
dependencies:
buffer-from "^1.0.0"
inherits "^2.0.3"
readable-stream "^2.2.2"
typedarray "^0.0.6"
-connect-history-api-fallback@^1.3.0:
- version "1.5.0"
- resolved "http://registry.npm.taobao.org/connect-history-api-fallback/download/connect-history-api-fallback-1.5.0.tgz#b06873934bc5e344fef611a196a6faae0aee015a"
+concat-stream@^2.0.0:
+ version "2.0.0"
+ resolved "https://registry.yarnpkg.com/concat-stream/-/concat-stream-2.0.0.tgz#414cf5af790a48c60ab9be4527d56d5e41133cb1"
+ integrity sha512-MWufYdFw53ccGjCA+Ol7XJYpAlW6/prSMzuPOTRnJGcGzuhLn4Scrz7qf6o8bROZ514ltazcIFJZevcfbo0x7A==
+ dependencies:
+ buffer-from "^1.0.0"
+ inherits "^2.0.3"
+ readable-stream "^3.0.2"
+ typedarray "^0.0.6"
+
+connect-history-api-fallback@^1.6.0:
+ version "1.6.0"
+ resolved "https://registry.yarnpkg.com/connect-history-api-fallback/-/connect-history-api-fallback-1.6.0.tgz#8b32089359308d111115d81cad3fceab888f97bc"
+ integrity sha512-e54B99q/OUoH64zYYRf3HBP5z24G38h5D3qXu23JGRoigpX5Ss4r9ZnDk3g0Z8uQC2x2lPaJ+UlWBc1ZWBWdLg==
console-browserify@^1.1.0:
version "1.1.0"
- resolved "http://registry.npm.taobao.org/console-browserify/download/console-browserify-1.1.0.tgz#f0241c45730a9fc6323b206dbf38edc741d0bb10"
+ resolved "https://registry.yarnpkg.com/console-browserify/-/console-browserify-1.1.0.tgz#f0241c45730a9fc6323b206dbf38edc741d0bb10"
+ integrity sha1-8CQcRXMKn8YyOyBtvzjtx0HQuxA=
dependencies:
date-now "^0.1.4"
console-control-strings@^1.0.0, console-control-strings@~1.1.0:
version "1.1.0"
- resolved "http://registry.npm.taobao.org/console-control-strings/download/console-control-strings-1.1.0.tgz#3d7cf4464db6446ea644bf4b39507f9851008e8e"
-
-consolidate@^0.14.0:
- version "0.14.5"
- resolved "http://registry.npm.taobao.org/consolidate/download/consolidate-0.14.5.tgz#5a25047bc76f73072667c8cb52c989888f494c63"
- dependencies:
- bluebird "^3.1.1"
+ resolved "https://registry.yarnpkg.com/console-control-strings/-/console-control-strings-1.1.0.tgz#3d7cf4464db6446ea644bf4b39507f9851008e8e"
+ integrity sha1-PXz0Rk22RG6mRL9LOVB/mFEAjo4=
constants-browserify@^1.0.0:
version "1.0.0"
- resolved "http://registry.npm.taobao.org/constants-browserify/download/constants-browserify-1.0.0.tgz#c20b96d8c617748aaf1c16021760cd27fcb8cb75"
+ resolved "https://registry.yarnpkg.com/constants-browserify/-/constants-browserify-1.0.0.tgz#c20b96d8c617748aaf1c16021760cd27fcb8cb75"
+ integrity sha1-wguW2MYXdIqvHBYCF2DNJ/y4y3U=
[email protected]:
- version "0.5.2"
- resolved "http://registry.npm.taobao.org/content-disposition/download/content-disposition-0.5.2.tgz#0cf68bb9ddf5f2be7961c3a85178cb85dba78cb4"
+contains-path@^0.1.0:
+ version "0.1.0"
+ resolved "https://registry.yarnpkg.com/contains-path/-/contains-path-0.1.0.tgz#fe8cf184ff6670b6baef01a9d4861a5cbec4120a"
+ integrity sha1-/ozxhP9mcLa67wGp1IYaXL7EEgo=
+
[email protected]:
+ version "0.5.3"
+ resolved "https://registry.yarnpkg.com/content-disposition/-/content-disposition-0.5.3.tgz#e130caf7e7279087c5616c2007d0485698984fbd"
+ integrity sha512-ExO0774ikEObIAEV9kDo50o+79VCUdEB6n6lzKgGwupcVeRlhrj3qGAfwq8G6uBJjkqLrhT0qEYFcWng8z1z0g==
+ dependencies:
+ safe-buffer "5.1.2"
content-type@~1.0.4:
version "1.0.4"
- resolved "http://registry.npm.taobao.org/content-type/download/content-type-1.0.4.tgz#e138cc75e040c727b1966fe5e5f8c9aee256fe3b"
+ resolved "https://registry.yarnpkg.com/content-type/-/content-type-1.0.4.tgz#e138cc75e040c727b1966fe5e5f8c9aee256fe3b"
+ integrity sha512-hIP3EEPs8tB9AT1L+NUqtwOAps4mk2Zob89MWXMHjHWg9milF/j4osnnQLXBCBFBk/tvIG/tUc9mOUJiPBhPXA==
-conventional-changelog-angular@^1.3.3, conventional-changelog-angular@^1.6.6:
+conventional-changelog-angular@^1.3.3:
version "1.6.6"
- resolved "http://registry.npm.taobao.org/conventional-changelog-angular/download/conventional-changelog-angular-1.6.6.tgz#b27f2b315c16d0a1f23eb181309d0e6a4698ea0f"
+ resolved "https://registry.yarnpkg.com/conventional-changelog-angular/-/conventional-changelog-angular-1.6.6.tgz#b27f2b315c16d0a1f23eb181309d0e6a4698ea0f"
+ integrity sha512-suQnFSqCxRwyBxY68pYTsFkG0taIdinHLNEAX5ivtw8bCRnIgnpvcHmlR/yjUyZIrNPYAoXlY1WiEKWgSE4BNg==
dependencies:
compare-func "^1.3.1"
q "^1.5.1"
-conventional-changelog-atom@^0.2.8:
- version "0.2.8"
- resolved "http://registry.npm.taobao.org/conventional-changelog-atom/download/conventional-changelog-atom-0.2.8.tgz#8037693455990e3256f297320a45fa47ee553a14"
+conventional-changelog-angular@^5.0.3:
+ version "5.0.3"
+ resolved "https://registry.yarnpkg.com/conventional-changelog-angular/-/conventional-changelog-angular-5.0.3.tgz#299fdd43df5a1f095283ac16aeedfb0a682ecab0"
+ integrity sha512-YD1xzH7r9yXQte/HF9JBuEDfvjxxwDGGwZU1+ndanbY0oFgA+Po1T9JDSpPLdP0pZT6MhCAsdvFKC4TJ4MTJTA==
dependencies:
+ compare-func "^1.3.1"
q "^1.5.1"
-conventional-changelog-codemirror@^0.3.8:
- version "0.3.8"
- resolved "http://registry.npm.taobao.org/conventional-changelog-codemirror/download/conventional-changelog-codemirror-0.3.8.tgz#a1982c8291f4ee4d6f2f62817c6b2ecd2c4b7b47"
+conventional-changelog-atom@^2.0.1:
+ version "2.0.1"
+ resolved "https://registry.yarnpkg.com/conventional-changelog-atom/-/conventional-changelog-atom-2.0.1.tgz#dc88ce650ffa9ceace805cbe70f88bfd0cb2c13a"
+ integrity sha512-9BniJa4gLwL20Sm7HWSNXd0gd9c5qo49gCi8nylLFpqAHhkFTj7NQfROq3f1VpffRtzfTQp4VKU5nxbe2v+eZQ==
+ dependencies:
+ q "^1.5.1"
+
+conventional-changelog-codemirror@^2.0.1:
+ version "2.0.1"
+ resolved "https://registry.yarnpkg.com/conventional-changelog-codemirror/-/conventional-changelog-codemirror-2.0.1.tgz#acc046bc0971460939a0cc2d390e5eafc5eb30da"
+ integrity sha512-23kT5IZWa+oNoUaDUzVXMYn60MCdOygTA2I+UjnOMiYVhZgmVwNd6ri/yDlmQGXHqbKhNR5NoXdBzSOSGxsgIQ==
dependencies:
q "^1.5.1"
-conventional-changelog-core@^2.0.11:
- version "2.0.11"
- resolved "http://registry.npm.taobao.org/conventional-changelog-core/download/conventional-changelog-core-2.0.11.tgz#19b5fbd55a9697773ed6661f4e32030ed7e30287"
[email protected]:
+ version "1.0.0"
+ resolved "https://registry.yarnpkg.com/conventional-changelog-config-spec/-/conventional-changelog-config-spec-1.0.0.tgz#fc17bf0ab7b7f2a6b0c91bccc1bd55819d3ee79e"
+ integrity sha512-RR3479x5Qw7XWkmNDYx/kOnsQJW+FZBIakURG/Dg7FkTaCrGjAkgfH96pQs9SyOEZI07USEXy7FjUDWYP8bt3Q==
+
+conventional-changelog-conventionalcommits@^3.0.2:
+ version "3.0.2"
+ resolved "https://registry.yarnpkg.com/conventional-changelog-conventionalcommits/-/conventional-changelog-conventionalcommits-3.0.2.tgz#3a380a14ecd6f5056da6d460e30dd6c0c9f1aebe"
+ integrity sha512-w1+fQSDnm/7+sPKIYC5nfRVYDszt+6HdWizrigSqWFVIiiBVzkHGeqDLMSHc+Qq9qssHVAxAak5206epZyK87A==
+ dependencies:
+ compare-func "^1.3.1"
+ q "^1.5.1"
+
+conventional-changelog-core@^3.2.2:
+ version "3.2.2"
+ resolved "https://registry.yarnpkg.com/conventional-changelog-core/-/conventional-changelog-core-3.2.2.tgz#de41e6b4a71011a18bcee58e744f6f8f0e7c29c0"
+ integrity sha512-cssjAKajxaOX5LNAJLB+UOcoWjAIBvXtDMedv/58G+YEmAXMNfC16mmPl0JDOuVJVfIqM0nqQiZ8UCm8IXbE0g==
dependencies:
- conventional-changelog-writer "^3.0.9"
- conventional-commits-parser "^2.1.7"
+ conventional-changelog-writer "^4.0.5"
+ conventional-commits-parser "^3.0.2"
dateformat "^3.0.0"
get-pkg-repo "^1.0.0"
- git-raw-commits "^1.3.6"
+ git-raw-commits "2.0.0"
git-remote-origin-url "^2.0.0"
- git-semver-tags "^1.3.6"
+ git-semver-tags "^2.0.2"
lodash "^4.2.1"
normalize-package-data "^2.3.5"
q "^1.5.1"
- read-pkg "^1.1.0"
- read-pkg-up "^1.0.1"
- through2 "^2.0.0"
+ read-pkg "^3.0.0"
+ read-pkg-up "^3.0.0"
+ through2 "^3.0.0"
-conventional-changelog-ember@^0.3.12:
- version "0.3.12"
- resolved "http://registry.npm.taobao.org/conventional-changelog-ember/download/conventional-changelog-ember-0.3.12.tgz#b7d31851756d0fcb49b031dffeb6afa93b202400"
+conventional-changelog-ember@^2.0.2:
+ version "2.0.2"
+ resolved "https://registry.yarnpkg.com/conventional-changelog-ember/-/conventional-changelog-ember-2.0.2.tgz#284ffdea8c83ea8c210b65c5b4eb3e5cc0f4f51a"
+ integrity sha512-qtZbA3XefO/n6DDmkYywDYi6wDKNNc98MMl2F9PKSaheJ25Trpi3336W8fDlBhq0X+EJRuseceAdKLEMmuX2tg==
dependencies:
q "^1.5.1"
-conventional-changelog-eslint@^1.0.9:
- version "1.0.9"
- resolved "http://registry.npm.taobao.org/conventional-changelog-eslint/download/conventional-changelog-eslint-1.0.9.tgz#b13cc7e4b472c819450ede031ff1a75c0e3d07d3"
+conventional-changelog-eslint@^3.0.2:
+ version "3.0.2"
+ resolved "https://registry.yarnpkg.com/conventional-changelog-eslint/-/conventional-changelog-eslint-3.0.2.tgz#e9eb088cda6be3e58b2de6a5aac63df0277f3cbe"
+ integrity sha512-Yi7tOnxjZLXlCYBHArbIAm8vZ68QUSygFS7PgumPRiEk+9NPUeucy5Wg9AAyKoBprSV3o6P7Oghh4IZSLtKCvQ==
dependencies:
q "^1.5.1"
-conventional-changelog-express@^0.3.6:
- version "0.3.6"
- resolved "http://registry.npm.taobao.org/conventional-changelog-express/download/conventional-changelog-express-0.3.6.tgz#4a6295cb11785059fb09202180d0e59c358b9c2c"
+conventional-changelog-express@^2.0.1:
+ version "2.0.1"
+ resolved "https://registry.yarnpkg.com/conventional-changelog-express/-/conventional-changelog-express-2.0.1.tgz#fea2231d99a5381b4e6badb0c1c40a41fcacb755"
+ integrity sha512-G6uCuCaQhLxdb4eEfAIHpcfcJ2+ao3hJkbLrw/jSK/eROeNfnxCJasaWdDAfFkxsbpzvQT4W01iSynU3OoPLIw==
dependencies:
q "^1.5.1"
-conventional-changelog-jquery@^0.1.0:
- version "0.1.0"
- resolved "http://registry.npm.taobao.org/conventional-changelog-jquery/download/conventional-changelog-jquery-0.1.0.tgz#0208397162e3846986e71273b6c79c5b5f80f510"
- dependencies:
- q "^1.4.1"
-
-conventional-changelog-jscs@^0.1.0:
- version "0.1.0"
- resolved "http://registry.npm.taobao.org/conventional-changelog-jscs/download/conventional-changelog-jscs-0.1.0.tgz#0479eb443cc7d72c58bf0bcf0ef1d444a92f0e5c"
+conventional-changelog-jquery@^3.0.4:
+ version "3.0.4"
+ resolved "https://registry.yarnpkg.com/conventional-changelog-jquery/-/conventional-changelog-jquery-3.0.4.tgz#7eb598467b83db96742178e1e8d68598bffcd7ae"
+ integrity sha512-IVJGI3MseYoY6eybknnTf9WzeQIKZv7aNTm2KQsiFVJH21bfP2q7XVjfoMibdCg95GmgeFlaygMdeoDDa+ZbEQ==
dependencies:
- q "^1.4.1"
+ q "^1.5.1"
-conventional-changelog-jshint@^0.3.8:
- version "0.3.8"
- resolved "http://registry.npm.taobao.org/conventional-changelog-jshint/download/conventional-changelog-jshint-0.3.8.tgz#9051c1ac0767abaf62a31f74d2fe8790e8acc6c8"
+conventional-changelog-jshint@^2.0.1:
+ version "2.0.1"
+ resolved "https://registry.yarnpkg.com/conventional-changelog-jshint/-/conventional-changelog-jshint-2.0.1.tgz#11c0e8283abf156a4ff78e89be6fdedf9bd72202"
+ integrity sha512-kRFJsCOZzPFm2tzRHULWP4tauGMvccOlXYf3zGeuSW4U0mZhk5NsjnRZ7xFWrTFPlCLV+PNmHMuXp5atdoZmEg==
dependencies:
compare-func "^1.3.1"
q "^1.5.1"
-conventional-changelog-preset-loader@^1.1.8:
- version "1.1.8"
- resolved "http://registry.npm.taobao.org/conventional-changelog-preset-loader/download/conventional-changelog-preset-loader-1.1.8.tgz#40bb0f142cd27d16839ec6c74ee8db418099b373"
+conventional-changelog-preset-loader@^2.1.1:
+ version "2.1.1"
+ resolved "https://registry.yarnpkg.com/conventional-changelog-preset-loader/-/conventional-changelog-preset-loader-2.1.1.tgz#65bb600547c56d5627d23135154bcd9a907668c4"
+ integrity sha512-K4avzGMLm5Xw0Ek/6eE3vdOXkqnpf9ydb68XYmCc16cJ99XMMbc2oaNMuPwAsxVK6CC1yA4/I90EhmWNj0Q6HA==
-conventional-changelog-writer@^3.0.9:
- version "3.0.9"
- resolved "http://registry.npm.taobao.org/conventional-changelog-writer/download/conventional-changelog-writer-3.0.9.tgz#4aecdfef33ff2a53bb0cf3b8071ce21f0e994634"
+conventional-changelog-writer@^4.0.5:
+ version "4.0.6"
+ resolved "https://registry.yarnpkg.com/conventional-changelog-writer/-/conventional-changelog-writer-4.0.6.tgz#24db578ac8e7c89a409ef9bba12cf3c095990148"
+ integrity sha512-ou/sbrplJMM6KQpR5rKFYNVQYesFjN7WpNGdudQSWNi6X+RgyFUcSv871YBYkrUYV9EX8ijMohYVzn9RUb+4ag==
dependencies:
compare-func "^1.3.1"
- conventional-commits-filter "^1.1.6"
+ conventional-commits-filter "^2.0.2"
dateformat "^3.0.0"
- handlebars "^4.0.2"
+ handlebars "^4.1.0"
json-stringify-safe "^5.0.1"
lodash "^4.2.1"
meow "^4.0.0"
- semver "^5.5.0"
+ semver "^6.0.0"
split "^1.0.0"
- through2 "^2.0.0"
-
-conventional-changelog@^1.1.0:
- version "1.1.24"
- resolved "http://registry.npm.taobao.org/conventional-changelog/download/conventional-changelog-1.1.24.tgz#3d94c29c960f5261c002678315b756cdd3d7d1f0"
- dependencies:
- conventional-changelog-angular "^1.6.6"
- conventional-changelog-atom "^0.2.8"
- conventional-changelog-codemirror "^0.3.8"
- conventional-changelog-core "^2.0.11"
- conventional-changelog-ember "^0.3.12"
- conventional-changelog-eslint "^1.0.9"
- conventional-changelog-express "^0.3.6"
- conventional-changelog-jquery "^0.1.0"
- conventional-changelog-jscs "^0.1.0"
- conventional-changelog-jshint "^0.3.8"
- conventional-changelog-preset-loader "^1.1.8"
+ through2 "^3.0.0"
+
[email protected]:
+ version "3.1.8"
+ resolved "https://registry.yarnpkg.com/conventional-changelog/-/conventional-changelog-3.1.8.tgz#091382b5a0820bf8ec8e75ad2664a3688c31b07d"
+ integrity sha512-fb3/DOLLrQdNqN0yYn/lT6HcNsAa9A+VTDBqlZBMQcEPPIeJIMI+DBs3yu+eiYOLi22w9oShq3nn/zN6qm1Hmw==
+ dependencies:
+ conventional-changelog-angular "^5.0.3"
+ conventional-changelog-atom "^2.0.1"
+ conventional-changelog-codemirror "^2.0.1"
+ conventional-changelog-conventionalcommits "^3.0.2"
+ conventional-changelog-core "^3.2.2"
+ conventional-changelog-ember "^2.0.2"
+ conventional-changelog-eslint "^3.0.2"
+ conventional-changelog-express "^2.0.1"
+ conventional-changelog-jquery "^3.0.4"
+ conventional-changelog-jshint "^2.0.1"
+ conventional-changelog-preset-loader "^2.1.1"
conventional-commit-types@^2.0.0:
- version "2.2.0"
- resolved "http://registry.npm.taobao.org/conventional-commit-types/download/conventional-commit-types-2.2.0.tgz#5db95739d6c212acbe7b6f656a11b940baa68946"
+ version "2.1.1"
+ resolved "https://registry.yarnpkg.com/conventional-commit-types/-/conventional-commit-types-2.1.1.tgz#352eb53f56fbc7c1a6c1ba059c2b6670c90b2a8a"
+ integrity sha512-0Ts+fEdmjqYDOQ1yZ+LNgdSPO335XZw9qC10M7CxtLP3nIMGmeMhmkM8Taffa4+MXN13bRPlp0CtH+QfOzKTzw==
-conventional-commits-filter@^1.1.1, conventional-commits-filter@^1.1.6:
- version "1.1.6"
- resolved "http://registry.npm.taobao.org/conventional-commits-filter/download/conventional-commits-filter-1.1.6.tgz#4389cd8e58fe89750c0b5fb58f1d7f0cc8ad3831"
+conventional-commits-filter@^2.0.2:
+ version "2.0.2"
+ resolved "https://registry.yarnpkg.com/conventional-commits-filter/-/conventional-commits-filter-2.0.2.tgz#f122f89fbcd5bb81e2af2fcac0254d062d1039c1"
+ integrity sha512-WpGKsMeXfs21m1zIw4s9H5sys2+9JccTzpN6toXtxhpw2VNF2JUXwIakthKBy+LN4DvJm+TzWhxOMWOs1OFCFQ==
dependencies:
- is-subset "^0.1.1"
+ lodash.ismatch "^4.4.0"
modify-values "^1.0.0"
-conventional-commits-parser@^2.1.0, conventional-commits-parser@^2.1.1, conventional-commits-parser@^2.1.7:
+conventional-commits-parser@^2.1.0:
version "2.1.7"
- resolved "http://registry.npm.taobao.org/conventional-commits-parser/download/conventional-commits-parser-2.1.7.tgz#eca45ed6140d72ba9722ee4132674d639e644e8e"
+ resolved "https://registry.yarnpkg.com/conventional-commits-parser/-/conventional-commits-parser-2.1.7.tgz#eca45ed6140d72ba9722ee4132674d639e644e8e"
+ integrity sha512-BoMaddIEJ6B4QVMSDu9IkVImlGOSGA1I2BQyOZHeLQ6qVOJLcLKn97+fL6dGbzWEiqDzfH4OkcveULmeq2MHFQ==
dependencies:
JSONStream "^1.0.4"
is-text-path "^1.0.0"
@@ -2330,33 +2781,54 @@ conventional-commits-parser@^2.1.0, conventional-commits-parser@^2.1.1, conventi
through2 "^2.0.0"
trim-off-newlines "^1.0.0"
-conventional-recommended-bump@^1.0.0:
- version "1.2.1"
- resolved "http://registry.npm.taobao.org/conventional-recommended-bump/download/conventional-recommended-bump-1.2.1.tgz#1b7137efb5091f99fe009e2fe9ddb7cc490e9375"
+conventional-commits-parser@^3.0.2:
+ version "3.0.3"
+ resolved "https://registry.yarnpkg.com/conventional-commits-parser/-/conventional-commits-parser-3.0.3.tgz#c3f972fd4e056aa8b9b4f5f3d0e540da18bf396d"
+ integrity sha512-KaA/2EeUkO4bKjinNfGUyqPTX/6w9JGshuQRik4r/wJz7rUw3+D3fDG6sZSEqJvKILzKXFQuFkpPLclcsAuZcg==
dependencies:
- concat-stream "^1.4.10"
- conventional-commits-filter "^1.1.1"
- conventional-commits-parser "^2.1.1"
- git-raw-commits "^1.3.0"
- git-semver-tags "^1.3.0"
- meow "^3.3.0"
- object-assign "^4.0.1"
+ JSONStream "^1.0.4"
+ is-text-path "^2.0.0"
+ lodash "^4.2.1"
+ meow "^4.0.0"
+ split2 "^2.0.0"
+ through2 "^3.0.0"
+ trim-off-newlines "^1.0.0"
-convert-source-map@^1.4.0, convert-source-map@^1.5.0, convert-source-map@^1.5.1:
- version "1.5.1"
- resolved "http://registry.npm.taobao.org/convert-source-map/download/convert-source-map-1.5.1.tgz#b8278097b9bc229365de5c62cf5fcaed8b5599e5"
[email protected]:
+ version "5.0.0"
+ resolved "https://registry.yarnpkg.com/conventional-recommended-bump/-/conventional-recommended-bump-5.0.0.tgz#019d45a1f3d2cc14a26e9bad1992406ded5baa23"
+ integrity sha512-CsfdICpbUe0pmM4MTG90GPUqnFgB1SWIR2HAh+vS+JhhJdPWvc0brs8oadWoYGhFOQpQwe57JnvzWEWU0m2OSg==
+ dependencies:
+ concat-stream "^2.0.0"
+ conventional-changelog-preset-loader "^2.1.1"
+ conventional-commits-filter "^2.0.2"
+ conventional-commits-parser "^3.0.2"
+ git-raw-commits "2.0.0"
+ git-semver-tags "^2.0.2"
+ meow "^4.0.0"
+ q "^1.5.1"
+
+convert-source-map@^1.1.0, convert-source-map@^1.4.0:
+ version "1.6.0"
+ resolved "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-1.6.0.tgz#51b537a8c43e0f04dec1993bffcdd504e758ac20"
+ integrity sha512-eFu7XigvxdZ1ETfbgPBohgyQ/Z++C0eEhTor0qRwBw9unw+L0/6V8wkSuGgzdThkiS5lSpdptOQPD8Ak40a+7A==
+ dependencies:
+ safe-buffer "~5.1.1"
[email protected]:
version "1.0.6"
- resolved "http://registry.npm.taobao.org/cookie-signature/download/cookie-signature-1.0.6.tgz#e303a882b342cc3ee8ca513a79999734dab3ae2c"
+ resolved "https://registry.yarnpkg.com/cookie-signature/-/cookie-signature-1.0.6.tgz#e303a882b342cc3ee8ca513a79999734dab3ae2c"
+ integrity sha1-4wOogrNCzD7oylE6eZmXNNqzriw=
[email protected]:
- version "0.3.1"
- resolved "http://registry.npm.taobao.org/cookie/download/cookie-0.3.1.tgz#e7e0a1f9ef43b4c8ba925c5c5a96e806d16873bb"
[email protected]:
+ version "0.4.0"
+ resolved "https://registry.yarnpkg.com/cookie/-/cookie-0.4.0.tgz#beb437e7022b3b6d49019d088665303ebe9c14ba"
+ integrity sha512-+Hp8fLp57wnUSt0tY0tHEXh4voZRDnoIrZPqlo3DPiI4y9lwg/jqx+1Om94/W6ZaPDOUbnjOt/99w66zk+l1Xg==
copy-concurrently@^1.0.0:
version "1.0.5"
- resolved "http://registry.npm.taobao.org/copy-concurrently/download/copy-concurrently-1.0.5.tgz#92297398cae34937fcafd6ec8139c18051f0b5e0"
+ resolved "https://registry.yarnpkg.com/copy-concurrently/-/copy-concurrently-1.0.5.tgz#92297398cae34937fcafd6ec8139c18051f0b5e0"
+ integrity sha512-f2domd9fsVDFtaFcbaRZuYXwtdmnzqbADSwhSWYxYB/Q8zsdUUFMXVRwXGDMWmbEzAn1kdRrtI1T/KTFOL4X2A==
dependencies:
aproba "^1.1.1"
fs-write-stream-atomic "^1.0.8"
@@ -2367,11 +2839,13 @@ copy-concurrently@^1.0.0:
copy-descriptor@^0.1.0:
version "0.1.1"
- resolved "http://registry.npm.taobao.org/copy-descriptor/download/copy-descriptor-0.1.1.tgz#676f6eb3c39997c2ee1ac3a924fd6124748f578d"
+ resolved "https://registry.yarnpkg.com/copy-descriptor/-/copy-descriptor-0.1.1.tgz#676f6eb3c39997c2ee1ac3a924fd6124748f578d"
+ integrity sha1-Z29us8OZl8LuGsOpJP1hJHSPV40=
-copy-webpack-plugin@^4.3.1:
- version "4.5.1"
- resolved "http://registry.npm.taobao.org/copy-webpack-plugin/download/copy-webpack-plugin-4.5.1.tgz#fc4f68f4add837cc5e13d111b20715793225d29c"
+copy-webpack-plugin@^4.5.1:
+ version "4.6.0"
+ resolved "https://registry.yarnpkg.com/copy-webpack-plugin/-/copy-webpack-plugin-4.6.0.tgz#e7f40dd8a68477d405dd1b7a854aae324b158bae"
+ integrity sha512-Y+SQCF+0NoWQryez2zXn5J5knmr9z/9qSQt7fbL78u83rxmigOy8X5+BFn8CFSuX+nKT8gpYwJX68ekqtQt6ZA==
dependencies:
cacache "^10.0.4"
find-cache-dir "^1.0.0"
@@ -2382,88 +2856,67 @@ copy-webpack-plugin@^4.3.1:
p-limit "^1.0.0"
serialize-javascript "^1.4.0"
-core-js@^1.0.0:
- version "1.2.7"
- resolved "http://registry.npm.taobao.org/core-js/download/core-js-1.2.7.tgz#652294c14651db28fa93bd2d5ff2983a4f08c636"
+core-js-compat@^3.1.1:
+ version "3.1.4"
+ resolved "https://registry.yarnpkg.com/core-js-compat/-/core-js-compat-3.1.4.tgz#e4d0c40fbd01e65b1d457980fe4112d4358a7408"
+ integrity sha512-Z5zbO9f1d0YrJdoaQhphVAnKPimX92D6z8lCGphH89MNRxlL1prI9ExJPqVwP0/kgkQCv8c4GJGT8X16yUncOg==
+ dependencies:
+ browserslist "^4.6.2"
+ core-js-pure "3.1.4"
+ semver "^6.1.1"
+
[email protected]:
+ version "3.1.4"
+ resolved "https://registry.yarnpkg.com/core-js-pure/-/core-js-pure-3.1.4.tgz#5fa17dc77002a169a3566cc48dc774d2e13e3769"
+ integrity sha512-uJ4Z7iPNwiu1foygbcZYJsJs1jiXrTTCvxfLDXNhI/I+NHbSIEyr548y4fcsCEyWY0XgfAG/qqaunJ1SThHenA==
core-js@^2.4.0, core-js@^2.5.0:
- version "2.5.7"
- resolved "http://registry.npm.taobao.org/core-js/download/core-js-2.5.7.tgz#f972608ff0cead68b841a16a932d0b183791814e"
+ version "2.6.9"
+ resolved "https://registry.yarnpkg.com/core-js/-/core-js-2.6.9.tgz#6b4b214620c834152e179323727fc19741b084f2"
+ integrity sha512-HOpZf6eXmnl7la+cUdMnLvUxKNqLUzJvgIziQ0DiF3JwSImNphIqdGqzj6hIKyX04MmV0poclQ7+wjWvxQyR2A==
[email protected], core-util-is@~1.0.0:
version "1.0.2"
- resolved "http://registry.npm.taobao.org/core-util-is/download/core-util-is-1.0.2.tgz#b5fd54220aa2bc5ab57aab7140c940754503c1a7"
-
-cosmiconfig@^2.1.0, cosmiconfig@^2.1.1:
- version "2.2.2"
- resolved "http://registry.npm.taobao.org/cosmiconfig/download/cosmiconfig-2.2.2.tgz#6173cebd56fac042c1f4390edf7af6c07c7cb892"
- dependencies:
- is-directory "^0.3.1"
- js-yaml "^3.4.3"
- minimist "^1.2.0"
- object-assign "^4.1.0"
- os-homedir "^1.0.1"
- parse-json "^2.2.0"
- require-from-string "^1.1.0"
+ resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.2.tgz#b5fd54220aa2bc5ab57aab7140c940754503c1a7"
+ integrity sha1-tf1UIgqivFq1eqtxQMlAdUUDwac=
-cosmiconfig@^4.0.0:
- version "4.0.0"
- resolved "http://registry.npm.taobao.org/cosmiconfig/download/cosmiconfig-4.0.0.tgz#760391549580bbd2df1e562bc177b13c290972dc"
- dependencies:
- is-directory "^0.3.1"
- js-yaml "^3.9.0"
- parse-json "^4.0.0"
- require-from-string "^2.0.1"
-
-cosmiconfig@^5.0.7:
- version "5.0.7"
- resolved "https://registry.yarnpkg.com/cosmiconfig/-/cosmiconfig-5.0.7.tgz#39826b292ee0d78eda137dfa3173bd1c21a43b04"
- integrity sha512-PcLqxTKiDmNT6pSpy4N6KtuPwb53W+2tzNvwOZw0WH9N6O0vLIBq0x8aj8Oj75ere4YcGi48bDFCL+3fRJdlNA==
+cosmiconfig@^5.2.0, cosmiconfig@^5.2.1:
+ version "5.2.1"
+ resolved "https://registry.yarnpkg.com/cosmiconfig/-/cosmiconfig-5.2.1.tgz#040f726809c591e77a17c0a3626ca45b4f168b1a"
+ integrity sha512-H65gsXo1SKjf8zmrJ67eJk8aIRKV5ff2D4uKZIBZShbhGSpEmsQOPW/SKMKYhSTrqR7ufy6RP69rPogdaPh/kA==
dependencies:
import-fresh "^2.0.0"
is-directory "^0.3.1"
- js-yaml "^3.9.0"
+ js-yaml "^3.13.1"
parse-json "^4.0.0"
-cpx@^1.5.0:
- version "1.5.0"
- resolved "http://registry.npm.taobao.org/cpx/download/cpx-1.5.0.tgz#185be018511d87270dedccc293171e37655ab88f"
- dependencies:
- babel-runtime "^6.9.2"
- chokidar "^1.6.0"
- duplexer "^0.1.1"
- glob "^7.0.5"
- glob2base "^0.0.12"
- minimatch "^3.0.2"
- mkdirp "^0.5.1"
- resolve "^1.1.7"
- safe-buffer "^5.0.1"
- shell-quote "^1.6.1"
- subarg "^1.0.0"
-
crc32-stream@^2.0.0:
version "2.0.0"
- resolved "http://registry.npm.taobao.org/crc32-stream/download/crc32-stream-2.0.0.tgz#e3cdd3b4df3168dd74e3de3fbbcb7b297fe908f4"
+ resolved "https://registry.yarnpkg.com/crc32-stream/-/crc32-stream-2.0.0.tgz#e3cdd3b4df3168dd74e3de3fbbcb7b297fe908f4"
+ integrity sha1-483TtN8xaN10494/u8t7KX/pCPQ=
dependencies:
crc "^3.4.4"
readable-stream "^2.0.0"
crc@^3.4.4:
version "3.8.0"
- resolved "http://registry.npm.taobao.org/crc/download/crc-3.8.0.tgz#ad60269c2c856f8c299e2c4cc0de4556914056c6"
+ resolved "https://registry.yarnpkg.com/crc/-/crc-3.8.0.tgz#ad60269c2c856f8c299e2c4cc0de4556914056c6"
+ integrity sha512-iX3mfgcTMIq3ZKLIsVFAbv7+Mc10kxabAGQb8HvjA1o3T1PIYprbakQ65d3I+2HGHt6nSKkM9PYjgoJO2KcFBQ==
dependencies:
buffer "^5.1.0"
create-ecdh@^4.0.0:
version "4.0.3"
- resolved "http://registry.npm.taobao.org/create-ecdh/download/create-ecdh-4.0.3.tgz#c9111b6f33045c4697f144787f9254cdc77c45ff"
+ resolved "https://registry.yarnpkg.com/create-ecdh/-/create-ecdh-4.0.3.tgz#c9111b6f33045c4697f144787f9254cdc77c45ff"
+ integrity sha512-GbEHQPMOswGpKXM9kCWVrremUcBmjteUaQ01T9rkKCPDXfUHX0IoP9LpHYo2NPFampa4e+/pFDc3jQdxrxQLaw==
dependencies:
bn.js "^4.1.0"
elliptic "^6.0.0"
create-hash@^1.1.0, create-hash@^1.1.2:
version "1.2.0"
- resolved "http://registry.npm.taobao.org/create-hash/download/create-hash-1.2.0.tgz#889078af11a63756bcfb59bd221996be3a9ef196"
+ resolved "https://registry.yarnpkg.com/create-hash/-/create-hash-1.2.0.tgz#889078af11a63756bcfb59bd221996be3a9ef196"
+ integrity sha512-z00bCGNHDG8mHAkP7CtT1qVu+bFQUPjYq/4Iv3C3kWjTFV10zIjfSoeqXo9Asws8gwSHDGj/hl2u4OGIjapeCg==
dependencies:
cipher-base "^1.0.1"
inherits "^2.0.1"
@@ -2473,7 +2926,8 @@ create-hash@^1.1.0, create-hash@^1.1.2:
create-hmac@^1.1.0, create-hmac@^1.1.2, create-hmac@^1.1.4:
version "1.1.7"
- resolved "http://registry.npm.taobao.org/create-hmac/download/create-hmac-1.1.7.tgz#69170c78b3ab957147b2b8b04572e47ead2243ff"
+ resolved "https://registry.yarnpkg.com/create-hmac/-/create-hmac-1.1.7.tgz#69170c78b3ab957147b2b8b04572e47ead2243ff"
+ integrity sha512-MJG9liiZ+ogc4TzUwuvbER1JRdgvUFSB5+VR/g5h82fGaIRWMWddtKBHi7/sVhfjQZ6SehlyhvQYrcYkaUIpLg==
dependencies:
cipher-base "^1.0.3"
create-hash "^1.1.0"
@@ -2482,39 +2936,7 @@ create-hmac@^1.1.0, create-hmac@^1.1.2, create-hmac@^1.1.4:
safe-buffer "^5.0.1"
sha.js "^2.4.8"
[email protected], create-react-class@^15.5.2, create-react-class@^15.5.3, create-react-class@^15.6.0:
- version "15.6.3"
- resolved "http://registry.npm.taobao.org/create-react-class/download/create-react-class-15.6.3.tgz#2d73237fb3f970ae6ebe011a9e66f46dbca80036"
- integrity sha1-LXMjf7P5cK5uvgEanmb0bbyoADY=
- dependencies:
- fbjs "^0.8.9"
- loose-envify "^1.3.1"
- object-assign "^4.1.1"
-
-create-react-context@^0.2.2:
- version "0.2.3"
- resolved "http://registry.npm.taobao.org/create-react-context/download/create-react-context-0.2.3.tgz#9ec140a6914a22ef04b8b09b7771de89567cb6f3"
- integrity sha1-nsFAppFKIu8EuLCbd3HeiVZ8tvM=
- dependencies:
- fbjs "^0.8.0"
- gud "^1.0.0"
-
[email protected], cross-spawn@^5.0.1:
- version "5.1.0"
- resolved "http://registry.npm.taobao.org/cross-spawn/download/cross-spawn-5.1.0.tgz#e8bd0efee58fcff6f8f94510a0a554bbfa235449"
- dependencies:
- lru-cache "^4.0.1"
- shebang-command "^1.2.0"
- which "^1.2.9"
-
-cross-spawn@^3.0.0:
- version "3.0.1"
- resolved "http://registry.npm.taobao.org/cross-spawn/download/cross-spawn-3.0.1.tgz#1256037ecb9f0c5f79e3d6ef135e30770184b982"
- dependencies:
- lru-cache "^4.0.1"
- which "^1.2.9"
-
-cross-spawn@^6.0.0:
[email protected], cross-spawn@^6.0.0, cross-spawn@^6.0.5:
version "6.0.5"
resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-6.0.5.tgz#4a5ec7c64dfae22c3a14124dbacdee846d80cbc4"
integrity sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==
@@ -2525,19 +2947,10 @@ cross-spawn@^6.0.0:
shebang-command "^1.2.0"
which "^1.2.9"
-crypt@~0.0.1:
- version "0.0.2"
- resolved "https://registry.yarnpkg.com/crypt/-/crypt-0.0.2.tgz#88d7ff7ec0dfb86f713dc87bbb42d044d3e6c41b"
-
[email protected]:
- version "2.0.5"
- resolved "http://registry.npm.taobao.org/cryptiles/download/cryptiles-2.0.5.tgz#3bdfecdc608147c1c67202fa291e7dca59eaa3b8"
- dependencies:
- boom "2.x.x"
-
crypto-browserify@^3.11.0:
version "3.12.0"
- resolved "http://registry.npm.taobao.org/crypto-browserify/download/crypto-browserify-3.12.0.tgz#396cf9f3137f03e4b8e532c58f698254e00f80ec"
+ resolved "https://registry.yarnpkg.com/crypto-browserify/-/crypto-browserify-3.12.0.tgz#396cf9f3137f03e4b8e532c58f698254e00f80ec"
+ integrity sha512-fz4spIh+znjO2VjL+IdhEpRJ3YN6sMzITSBijk6FK2UvTqruSQW+/cCZTSNsMiZNvUeq0CqurF+dAbyiGOY6Wg==
dependencies:
browserify-cipher "^1.0.0"
browserify-sign "^4.0.0"
@@ -2551,151 +2964,71 @@ crypto-browserify@^3.11.0:
randombytes "^2.0.0"
randomfill "^1.0.3"
[email protected], css-animation@^1.3.2:
- version "1.4.1"
- resolved "http://registry.npm.taobao.org/css-animation/download/css-animation-1.4.1.tgz#5b8813125de0fbbbb0bbe1b472ae84221469b7a8"
- dependencies:
- babel-runtime "6.x"
- component-classes "^1.2.5"
-
-css-animation@^1.2.5:
- version "1.5.0"
- resolved "http://registry.npm.taobao.org/css-animation/download/css-animation-1.5.0.tgz#c96b9097a5ef74a7be8480b45cc44e4ec6ca2bf5"
- integrity sha1-yWuQl6XvdKe+hIC0XMROTsbKK/U=
- dependencies:
- babel-runtime "6.x"
- component-classes "^1.2.5"
-
[email protected]:
- version "0.0.4"
- resolved "http://registry.npm.taobao.org/css-color-names/download/css-color-names-0.0.4.tgz#808adc2e79cf84738069b646cb20ec27beb629e0"
-
[email protected]:
- version "0.28.10"
- resolved "http://registry.npm.taobao.org/css-loader/download/css-loader-0.28.10.tgz#40282e79230f7bcb4e483efa631d670b735ebf42"
- dependencies:
- babel-code-frame "^6.26.0"
- css-selector-tokenizer "^0.7.0"
- cssnano "^3.10.0"
- icss-utils "^2.1.0"
- loader-utils "^1.0.2"
- lodash.camelcase "^4.3.0"
- object-assign "^4.1.1"
- postcss "^5.0.6"
- postcss-modules-extract-imports "^1.2.0"
- postcss-modules-local-by-default "^1.2.0"
- postcss-modules-scope "^1.1.0"
- postcss-modules-values "^1.3.0"
+css-loader@^2.1.1:
+ version "2.1.1"
+ resolved "https://registry.yarnpkg.com/css-loader/-/css-loader-2.1.1.tgz#d8254f72e412bb2238bb44dd674ffbef497333ea"
+ integrity sha512-OcKJU/lt232vl1P9EEDamhoO9iKY3tIjY5GU+XDLblAykTdgs6Ux9P1hTHve8nFKy5KPpOXOsVI/hIwi3841+w==
+ dependencies:
+ camelcase "^5.2.0"
+ icss-utils "^4.1.0"
+ loader-utils "^1.2.3"
+ normalize-path "^3.0.0"
+ postcss "^7.0.14"
+ postcss-modules-extract-imports "^2.0.0"
+ postcss-modules-local-by-default "^2.0.6"
+ postcss-modules-scope "^2.1.0"
+ postcss-modules-values "^2.0.0"
postcss-value-parser "^3.3.0"
- source-list-map "^2.0.0"
+ schema-utils "^1.0.0"
-css-select@^1.1.0, css-select@~1.2.0:
+css-select@^1.1.0:
version "1.2.0"
- resolved "http://registry.npm.taobao.org/css-select/download/css-select-1.2.0.tgz#2b3a110539c5355f1cd8d314623e870b121ec858"
+ resolved "https://registry.yarnpkg.com/css-select/-/css-select-1.2.0.tgz#2b3a110539c5355f1cd8d314623e870b121ec858"
+ integrity sha1-KzoRBTnFNV8c2NMUYj6HCxIeyFg=
dependencies:
boolbase "~1.0.0"
css-what "2.1"
domutils "1.5.1"
nth-check "~1.0.1"
-css-selector-tokenizer@^0.7.0:
- version "0.7.0"
- resolved "http://registry.npm.taobao.org/css-selector-tokenizer/download/css-selector-tokenizer-0.7.0.tgz#e6988474ae8c953477bf5e7efecfceccd9cf4c86"
- dependencies:
- cssesc "^0.1.0"
- fastparse "^1.1.1"
- regexpu-core "^1.0.0"
-
[email protected]:
- version "2.1.0"
- resolved "http://registry.npm.taobao.org/css-what/download/css-what-2.1.0.tgz#9467d032c38cfaefb9f2d79501253062f87fa1bd"
-
-cssesc@^0.1.0:
- version "0.1.0"
- resolved "http://registry.npm.taobao.org/cssesc/download/cssesc-0.1.0.tgz#c814903e45623371a0477b40109aaafbeeaddbb4"
+ version "2.1.3"
+ resolved "https://registry.yarnpkg.com/css-what/-/css-what-2.1.3.tgz#a6d7604573365fe74686c3f311c56513d88285f2"
+ integrity sha512-a+EPoD+uZiNfh+5fxw2nO9QwFa6nJe2Or35fGY6Ipw1R3R4AGz1d1TEZrCegvw2YTmZ0jXirGYlzxxpYSHwpEg==
-cssnano@^3.10.0:
- version "3.10.0"
- resolved "http://registry.npm.taobao.org/cssnano/download/cssnano-3.10.0.tgz#4f38f6cea2b9b17fa01490f23f1dc68ea65c1c38"
- dependencies:
- autoprefixer "^6.3.1"
- decamelize "^1.1.2"
- defined "^1.0.0"
- has "^1.0.1"
- object-assign "^4.0.1"
- postcss "^5.0.14"
- postcss-calc "^5.2.0"
- postcss-colormin "^2.1.8"
- postcss-convert-values "^2.3.4"
- postcss-discard-comments "^2.0.4"
- postcss-discard-duplicates "^2.0.1"
- postcss-discard-empty "^2.0.1"
- postcss-discard-overridden "^0.1.1"
- postcss-discard-unused "^2.2.1"
- postcss-filter-plugins "^2.0.0"
- postcss-merge-idents "^2.1.5"
- postcss-merge-longhand "^2.0.1"
- postcss-merge-rules "^2.0.3"
- postcss-minify-font-values "^1.0.2"
- postcss-minify-gradients "^1.0.1"
- postcss-minify-params "^1.0.4"
- postcss-minify-selectors "^2.0.4"
- postcss-normalize-charset "^1.1.0"
- postcss-normalize-url "^3.0.7"
- postcss-ordered-values "^2.1.0"
- postcss-reduce-idents "^2.2.2"
- postcss-reduce-initial "^1.0.0"
- postcss-reduce-transforms "^1.0.3"
- postcss-svgo "^2.1.1"
- postcss-unique-selectors "^2.0.2"
- postcss-value-parser "^3.2.3"
- postcss-zindex "^2.0.1"
-
-csso@~2.3.1:
- version "2.3.2"
- resolved "http://registry.npm.taobao.org/csso/download/csso-2.3.2.tgz#ddd52c587033f49e94b71fc55569f252e8ff5f85"
- dependencies:
- clap "^1.0.9"
- source-map "^0.5.3"
+cssesc@^3.0.0:
+ version "3.0.0"
+ resolved "https://registry.yarnpkg.com/cssesc/-/cssesc-3.0.0.tgz#37741919903b868565e1c09ea747445cd18983ee"
+ integrity sha512-/Tb/JcjK111nNScGob5MNtsntNM1aCNUDipB/TkwZFhyDrrE47SOx/18wF2bbjgc3ZzCSKW1T5nt5EbFoAz/Vg==
[email protected], "cssom@>= 0.3.2 < 0.4.0":
- version "0.3.2"
- resolved "http://registry.npm.taobao.org/cssom/download/cssom-0.3.2.tgz#b8036170c79f07a90ff2f16e22284027a243848b"
+"cssom@>= 0.3.2 < 0.4.0", cssom@~0.3.6:
+ version "0.3.8"
+ resolved "https://registry.yarnpkg.com/cssom/-/cssom-0.3.8.tgz#9f1276f5b2b463f2114d3f2c75250af8c1a36f4a"
+ integrity sha512-b0tGHbfegbhPJpxpiBPU2sCkigAqtM9O121le6bbOlgyV+NyGyCmVfJ6QW9eRjz8CpNfWEOYBIMIGRYkLwsIYg==
-"cssstyle@>= 0.3.1 < 0.4.0":
- version "0.3.1"
- resolved "http://registry.npm.taobao.org/cssstyle/download/cssstyle-0.3.1.tgz#6da9b4cff1bc5d716e6e5fe8e04fcb1b50a49adf"
+cssstyle@^1.0.0:
+ version "1.3.0"
+ resolved "https://registry.yarnpkg.com/cssstyle/-/cssstyle-1.3.0.tgz#c36c466f7037fd30f03baa271b65f0f17b50585c"
+ integrity sha512-wXsoRfsRfsLVNaVzoKdqvEmK/5PFaEXNspVT22Ots6K/cnJdpoDKuQFw+qlMiXnmaif1OgeC466X1zISgAOcGg==
dependencies:
- cssom "0.3.x"
-
-csstype@^2.2.0:
- version "2.5.2"
- resolved "http://registry.npm.taobao.org/csstype/download/csstype-2.5.2.tgz#4534308476ceede8fbe148b9b99f9baf1c80fa06"
+ cssom "~0.3.6"
currently-unhandled@^0.4.1:
version "0.4.1"
- resolved "http://registry.npm.taobao.org/currently-unhandled/download/currently-unhandled-0.4.1.tgz#988df33feab191ef799a61369dd76c17adf957ea"
+ resolved "https://registry.yarnpkg.com/currently-unhandled/-/currently-unhandled-0.4.1.tgz#988df33feab191ef799a61369dd76c17adf957ea"
+ integrity sha1-mI3zP+qxke95mmE2nddsF635V+o=
dependencies:
array-find-index "^1.0.1"
cyclist@~0.2.2:
version "0.2.2"
- resolved "http://registry.npm.taobao.org/cyclist/download/cyclist-0.2.2.tgz#1b33792e11e914a2fd6d6ed6447464444e5fa640"
-
[email protected]:
- version "2.0.0"
- resolved "http://registry.npm.taobao.org/cz-conventional-changelog/download/cz-conventional-changelog-2.0.0.tgz#55a979afdfe95e7024879d2a0f5924630170b533"
- dependencies:
- conventional-commit-types "^2.0.0"
- lodash.map "^4.5.1"
- longest "^1.0.1"
- pad-right "^0.2.2"
- right-pad "^1.0.1"
- word-wrap "^1.0.3"
+ resolved "https://registry.yarnpkg.com/cyclist/-/cyclist-0.2.2.tgz#1b33792e11e914a2fd6d6ed6447464444e5fa640"
+ integrity sha1-GzN5LhHpFKL9bW7WRHRkRE5fpkA=
-cz-conventional-changelog@^2.1.0:
[email protected], cz-conventional-changelog@^2.1.0:
version "2.1.0"
- resolved "http://registry.npm.taobao.org/cz-conventional-changelog/download/cz-conventional-changelog-2.1.0.tgz#2f4bc7390e3244e4df293e6ba351e4c740a7c764"
+ resolved "https://registry.yarnpkg.com/cz-conventional-changelog/-/cz-conventional-changelog-2.1.0.tgz#2f4bc7390e3244e4df293e6ba351e4c740a7c764"
+ integrity sha1-L0vHOQ4yROTfKT5ro1Hkx0Cnx2Q=
dependencies:
conventional-commit-types "^2.0.0"
lodash.map "^4.5.1"
@@ -2703,379 +3036,380 @@ cz-conventional-changelog@^2.1.0:
right-pad "^1.0.1"
word-wrap "^1.0.3"
-d@1:
- version "1.0.0"
- resolved "http://registry.npm.taobao.org/d/download/d-1.0.0.tgz#754bb5bfe55451da69a58b94d45f4c5b0462d58f"
- dependencies:
- es5-ext "^0.10.9"
-
dargs@^4.0.1:
version "4.1.0"
- resolved "http://registry.npm.taobao.org/dargs/download/dargs-4.1.0.tgz#03a9dbb4b5c2f139bf14ae53f0b8a2a6a86f4e17"
+ resolved "https://registry.yarnpkg.com/dargs/-/dargs-4.1.0.tgz#03a9dbb4b5c2f139bf14ae53f0b8a2a6a86f4e17"
+ integrity sha1-A6nbtLXC8Tm/FK5T8LiipqhvThc=
dependencies:
number-is-nan "^1.0.0"
dashdash@^1.12.0:
version "1.14.1"
- resolved "http://registry.npm.taobao.org/dashdash/download/dashdash-1.14.1.tgz#853cfa0f7cbe2fed5de20326b8dd581035f6e2f0"
+ resolved "https://registry.yarnpkg.com/dashdash/-/dashdash-1.14.1.tgz#853cfa0f7cbe2fed5de20326b8dd581035f6e2f0"
+ integrity sha1-hTz6D3y+L+1d4gMmuN1YEDX24vA=
dependencies:
assert-plus "^1.0.0"
data-urls@^1.0.0:
- version "1.0.0"
- resolved "http://registry.npm.taobao.org/data-urls/download/data-urls-1.0.0.tgz#24802de4e81c298ea8a9388bb0d8e461c774684f"
+ version "1.1.0"
+ resolved "https://registry.yarnpkg.com/data-urls/-/data-urls-1.1.0.tgz#15ee0582baa5e22bb59c77140da8f9c76963bbfe"
+ integrity sha512-YTWYI9se1P55u58gL5GkQHW4P6VJBJ5iBT+B5a7i2Tjadhv52paJG0qHX4A0OR6/t52odI64KP2YvFpkDOi3eQ==
dependencies:
- abab "^1.0.4"
- whatwg-mimetype "^2.0.0"
- whatwg-url "^6.4.0"
+ abab "^2.0.0"
+ whatwg-mimetype "^2.2.0"
+ whatwg-url "^7.0.0"
date-now@^0.1.4:
version "0.1.4"
- resolved "http://registry.npm.taobao.org/date-now/download/date-now-0.1.4.tgz#eaf439fd4d4848ad74e5cc7dbef200672b9e345b"
+ resolved "https://registry.yarnpkg.com/date-now/-/date-now-0.1.4.tgz#eaf439fd4d4848ad74e5cc7dbef200672b9e345b"
+ integrity sha1-6vQ5/U1ISK105cx9vvIAZyueNFs=
dateformat@^3.0.0:
version "3.0.3"
- resolved "http://registry.npm.taobao.org/dateformat/download/dateformat-3.0.3.tgz#a6e37499a4d9a9cf85ef5872044d62901c9889ae"
-
-de-indent@^1.0.2:
- version "1.0.2"
- resolved "http://registry.npm.taobao.org/de-indent/download/de-indent-1.0.2.tgz#b2038e846dc33baa5796128d0804b455b8c1e21d"
+ resolved "https://registry.yarnpkg.com/dateformat/-/dateformat-3.0.3.tgz#a6e37499a4d9a9cf85ef5872044d62901c9889ae"
+ integrity sha512-jyCETtSl3VMZMWeRo7iY1FL19ges1t55hMo5yaam4Jrsm5EPL89UQkoQRyiI+Yf4k8r2ZpdngkV8hr1lIdjb3Q==
[email protected], debug@^2.1.2, debug@^2.2.0, debug@^2.3.3, debug@^2.6.0, debug@^2.6.6, debug@^2.6.8, debug@^2.6.9:
[email protected], debug@^2.2.0, debug@^2.3.3, debug@^2.6.8, debug@^2.6.9:
version "2.6.9"
- resolved "http://registry.npm.taobao.org/debug/download/debug-2.6.9.tgz#5d128515df134ff327e90a4c93f4e077a536341f"
+ resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.9.tgz#5d128515df134ff327e90a4c93f4e077a536341f"
+ integrity sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==
dependencies:
ms "2.0.0"
-debug@^3.1.0:
- version "3.1.0"
- resolved "http://registry.npm.taobao.org/debug/download/debug-3.1.0.tgz#5bb5a0672628b64149566ba16819e61518c67261"
+debug@^3.2.5, debug@^3.2.6:
+ version "3.2.6"
+ resolved "https://registry.yarnpkg.com/debug/-/debug-3.2.6.tgz#e83d17de16d8a7efb7717edbe5fb10135eee629b"
+ integrity sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==
dependencies:
- ms "2.0.0"
+ ms "^2.1.1"
+
+debug@^4.0.1, debug@^4.1.0, debug@^4.1.1:
+ version "4.1.1"
+ resolved "https://registry.yarnpkg.com/debug/-/debug-4.1.1.tgz#3b72260255109c6b589cee050f1d516139664791"
+ integrity sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==
+ dependencies:
+ ms "^2.1.1"
decamelize-keys@^1.0.0:
version "1.1.0"
- resolved "http://registry.npm.taobao.org/decamelize-keys/download/decamelize-keys-1.1.0.tgz#d171a87933252807eb3cb61dc1c1445d078df2d9"
+ resolved "https://registry.yarnpkg.com/decamelize-keys/-/decamelize-keys-1.1.0.tgz#d171a87933252807eb3cb61dc1c1445d078df2d9"
+ integrity sha1-0XGoeTMlKAfrPLYdwcFEXQeN8tk=
dependencies:
decamelize "^1.1.0"
map-obj "^1.0.0"
-decamelize@^1.0.0, decamelize@^1.1.0, decamelize@^1.1.1, decamelize@^1.1.2:
+decamelize@^1.1.0, decamelize@^1.1.2, decamelize@^1.2.0:
version "1.2.0"
- resolved "http://registry.npm.taobao.org/decamelize/download/decamelize-1.2.0.tgz#f6534d15148269b20352e7bee26f501f9a191290"
-
-decamelize@^2.0.0:
- version "2.0.0"
- resolved "http://registry.npm.taobao.org/decamelize/download/decamelize-2.0.0.tgz#656d7bbc8094c4c788ea53c5840908c9c7d063c7"
- dependencies:
- xregexp "4.0.0"
+ resolved "https://registry.yarnpkg.com/decamelize/-/decamelize-1.2.0.tgz#f6534d15148269b20352e7bee26f501f9a191290"
+ integrity sha1-9lNNFRSCabIDUue+4m9QH5oZEpA=
decode-uri-component@^0.2.0:
version "0.2.0"
- resolved "http://registry.npm.taobao.org/decode-uri-component/download/decode-uri-component-0.2.0.tgz#eb3913333458775cb84cd1a1fae062106bb87545"
+ resolved "https://registry.yarnpkg.com/decode-uri-component/-/decode-uri-component-0.2.0.tgz#eb3913333458775cb84cd1a1fae062106bb87545"
+ integrity sha1-6zkTMzRYd1y4TNGh+uBiEGu4dUU=
[email protected]:
- version "0.6.0"
- resolved "http://registry.npm.taobao.org/dedent/download/dedent-0.6.0.tgz#0e6da8f0ce52838ef5cec5c8f9396b0c1b64a3cb"
[email protected]:
+ version "0.7.0"
+ resolved "https://registry.yarnpkg.com/dedent/-/dedent-0.7.0.tgz#2495ddbaf6eb874abb0e1be9df22d2e5a544326c"
+ integrity sha1-JJXduvbrh0q7Dhvp3yLS5aVEMmw=
deep-equal@^1.0.1:
version "1.0.1"
- resolved "http://registry.npm.taobao.org/deep-equal/download/deep-equal-1.0.1.tgz#f5d260292b660e084eff4cdbc9f08ad3247448b5"
+ resolved "https://registry.yarnpkg.com/deep-equal/-/deep-equal-1.0.1.tgz#f5d260292b660e084eff4cdbc9f08ad3247448b5"
+ integrity sha1-9dJgKStmDghO/0zbyfCK0yR0SLU=
deep-extend@^0.6.0:
version "0.6.0"
- resolved "http://registry.npm.taobao.org/deep-extend/download/deep-extend-0.6.0.tgz#c4fa7c95404a17a9c3e8ca7e1537312b736330ac"
+ resolved "https://registry.yarnpkg.com/deep-extend/-/deep-extend-0.6.0.tgz#c4fa7c95404a17a9c3e8ca7e1537312b736330ac"
+ integrity sha512-LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA==
deep-is@~0.1.3:
version "0.1.3"
- resolved "http://registry.npm.taobao.org/deep-is/download/deep-is-0.1.3.tgz#b369d6fb5dbc13eecf524f91b070feedc357cf34"
+ resolved "https://registry.yarnpkg.com/deep-is/-/deep-is-0.1.3.tgz#b369d6fb5dbc13eecf524f91b070feedc357cf34"
+ integrity sha1-s2nW+128E+7PUk+RsHD+7cNXzzQ=
-deepmerge@^2.0.1:
- version "2.1.0"
- resolved "http://registry.npm.taobao.org/deepmerge/download/deepmerge-2.1.0.tgz#511a54fff405fc346f0240bb270a3e9533a31102"
+deepmerge@^1.5.2:
+ version "1.5.2"
+ resolved "https://registry.yarnpkg.com/deepmerge/-/deepmerge-1.5.2.tgz#10499d868844cdad4fee0842df8c7f6f0c95a753"
+ integrity sha512-95k0GDqvBjZavkuvzx/YqVLv/6YYa17fz6ILMSf7neqQITCPbnfEnQvEgMPNjH4kgobe7+WIL0yJEHku+H3qtQ==
-default-require-extensions@^1.0.0:
- version "1.0.0"
- resolved "http://registry.npm.taobao.org/default-require-extensions/download/default-require-extensions-1.0.0.tgz#f37ea15d3e13ffd9b437d33e1a75b5fb97874cb8"
+deepmerge@^2.2.1:
+ version "2.2.1"
+ resolved "https://registry.yarnpkg.com/deepmerge/-/deepmerge-2.2.1.tgz#5d3ff22a01c00f645405a2fbc17d0778a1801170"
+ integrity sha512-R9hc1Xa/NOBi9WRVUWg19rl1UB7Tt4kuPd+thNJgFZoxXsTz7ncaPaeIm+40oSGuP33DfMb4sZt1QIGiJzC4EA==
+
+deepmerge@^3.3.0:
+ version "3.3.0"
+ resolved "https://registry.yarnpkg.com/deepmerge/-/deepmerge-3.3.0.tgz#d3c47fd6f3a93d517b14426b0628a17b0125f5f7"
+ integrity sha512-GRQOafGHwMHpjPx9iCvTgpu9NojZ49q794EEL94JVEw6VaeA8XTUyBKvAkOOjBX9oJNiV6G3P+T+tihFjo2TqA==
+
+default-gateway@^4.2.0:
+ version "4.2.0"
+ resolved "https://registry.yarnpkg.com/default-gateway/-/default-gateway-4.2.0.tgz#167104c7500c2115f6dd69b0a536bb8ed720552b"
+ integrity sha512-h6sMrVB1VMWVrW13mSc6ia/DwYYw5MN6+exNu1OaJeFac5aSAvwM7lZ0NVfTABuSkQelr4h5oebg3KB1XPdjgA==
dependencies:
- strip-bom "^2.0.0"
+ execa "^1.0.0"
+ ip-regex "^2.1.0"
-define-properties@^1.1.2:
- version "1.1.2"
- resolved "http://registry.npm.taobao.org/define-properties/download/define-properties-1.1.2.tgz#83a73f2fea569898fb737193c8f873caf6d45c94"
+define-properties@^1.1.2, define-properties@^1.1.3:
+ version "1.1.3"
+ resolved "https://registry.yarnpkg.com/define-properties/-/define-properties-1.1.3.tgz#cf88da6cbee26fe6db7094f61d870cbd84cee9f1"
+ integrity sha512-3MqfYKj2lLzdMSf8ZIZE/V+Zuy+BgD6f164e8K2w7dgnpKArBDerGYpM46IYYcjnkdPNMjPk9A6VFB8+3SKlXQ==
dependencies:
- foreach "^2.0.5"
- object-keys "^1.0.8"
+ object-keys "^1.0.12"
define-property@^0.2.5:
version "0.2.5"
- resolved "http://registry.npm.taobao.org/define-property/download/define-property-0.2.5.tgz#c35b1ef918ec3c990f9a5bc57be04aacec5c8116"
+ resolved "https://registry.yarnpkg.com/define-property/-/define-property-0.2.5.tgz#c35b1ef918ec3c990f9a5bc57be04aacec5c8116"
+ integrity sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=
dependencies:
is-descriptor "^0.1.0"
define-property@^1.0.0:
version "1.0.0"
- resolved "http://registry.npm.taobao.org/define-property/download/define-property-1.0.0.tgz#769ebaaf3f4a63aad3af9e8d304c9bbe79bfb0e6"
+ resolved "https://registry.yarnpkg.com/define-property/-/define-property-1.0.0.tgz#769ebaaf3f4a63aad3af9e8d304c9bbe79bfb0e6"
+ integrity sha1-dp66rz9KY6rTr56NMEybvnm/sOY=
dependencies:
is-descriptor "^1.0.0"
define-property@^2.0.2:
version "2.0.2"
- resolved "http://registry.npm.taobao.org/define-property/download/define-property-2.0.2.tgz#d459689e8d654ba77e02a817f8710d702cb16e9d"
+ resolved "https://registry.yarnpkg.com/define-property/-/define-property-2.0.2.tgz#d459689e8d654ba77e02a817f8710d702cb16e9d"
+ integrity sha512-jwK2UV4cnPpbcG7+VRARKTZPUWowwXA8bzH5NP6ud0oeAxyYPuGZUAC7hMugpCdz4BeSZl2Dl9k66CHJ/46ZYQ==
dependencies:
is-descriptor "^1.0.2"
isobject "^3.0.1"
-defined@^1.0.0:
- version "1.0.0"
- resolved "http://registry.npm.taobao.org/defined/download/defined-1.0.0.tgz#c98d9bcef75674188e110969151199e39b1fa693"
-
-del@^3.0.0:
- version "3.0.0"
- resolved "http://registry.npm.taobao.org/del/download/del-3.0.0.tgz#53ecf699ffcbcb39637691ab13baf160819766e5"
+del@^4.0.0, del@^4.1.1:
+ version "4.1.1"
+ resolved "https://registry.yarnpkg.com/del/-/del-4.1.1.tgz#9e8f117222ea44a31ff3a156c049b99052a9f0b4"
+ integrity sha512-QwGuEUouP2kVwQenAsOof5Fv8K9t3D8Ca8NxcXKrIpEHjTXK5J2nXLdP+ALI1cgv8wj7KuwBhTwBkOZSJKM5XQ==
dependencies:
+ "@types/glob" "^7.1.1"
globby "^6.1.0"
- is-path-cwd "^1.0.0"
- is-path-in-cwd "^1.0.0"
- p-map "^1.1.1"
- pify "^3.0.0"
- rimraf "^2.2.8"
+ is-path-cwd "^2.0.0"
+ is-path-in-cwd "^2.0.0"
+ p-map "^2.0.0"
+ pify "^4.0.1"
+ rimraf "^2.6.3"
delayed-stream@~1.0.0:
version "1.0.0"
- resolved "http://registry.npm.taobao.org/delayed-stream/download/delayed-stream-1.0.0.tgz#df3ae199acadfb7d440aaae0b29e2272b24ec619"
+ resolved "https://registry.yarnpkg.com/delayed-stream/-/delayed-stream-1.0.0.tgz#df3ae199acadfb7d440aaae0b29e2272b24ec619"
+ integrity sha1-3zrhmayt+31ECqrgsp4icrJOxhk=
delegates@^1.0.0:
version "1.0.0"
- resolved "http://registry.npm.taobao.org/delegates/download/delegates-1.0.0.tgz#84c6e159b81904fdca59a0ef44cd870d31250f9a"
-
[email protected]:
- version "1.1.1"
- resolved "http://registry.npm.taobao.org/depd/download/depd-1.1.1.tgz#5783b4e1c459f06fa5ca27f991f3d06e7a310359"
+ resolved "https://registry.yarnpkg.com/delegates/-/delegates-1.0.0.tgz#84c6e159b81904fdca59a0ef44cd870d31250f9a"
+ integrity sha1-hMbhWbgZBP3KWaDvRM2HDTElD5o=
-depd@~1.1.1, depd@~1.1.2:
+depd@~1.1.2:
version "1.1.2"
- resolved "http://registry.npm.taobao.org/depd/download/depd-1.1.2.tgz#9bcd52e14c097763e749b274c4346ed2e560b5a9"
+ resolved "https://registry.yarnpkg.com/depd/-/depd-1.1.2.tgz#9bcd52e14c097763e749b274c4346ed2e560b5a9"
+ integrity sha1-m81S4UwJd2PnSbJ0xDRu0uVgtak=
des.js@^1.0.0:
version "1.0.0"
- resolved "http://registry.npm.taobao.org/des.js/download/des.js-1.0.0.tgz#c074d2e2aa6a8a9a07dbd61f9a15c2cd83ec8ecc"
+ resolved "https://registry.yarnpkg.com/des.js/-/des.js-1.0.0.tgz#c074d2e2aa6a8a9a07dbd61f9a15c2cd83ec8ecc"
+ integrity sha1-wHTS4qpqipoH29YfmhXCzYPsjsw=
dependencies:
inherits "^2.0.1"
minimalistic-assert "^1.0.0"
destroy@~1.0.4:
version "1.0.4"
- resolved "http://registry.npm.taobao.org/destroy/download/destroy-1.0.4.tgz#978857442c44749e4206613e37946205826abd80"
+ resolved "https://registry.yarnpkg.com/destroy/-/destroy-1.0.4.tgz#978857442c44749e4206613e37946205826abd80"
+ integrity sha1-l4hXRCxEdJ5CBmE+N5RiBYJqvYA=
-detect-file@^0.1.0:
- version "0.1.0"
- resolved "http://registry.npm.taobao.org/detect-file/download/detect-file-0.1.0.tgz#4935dedfd9488648e006b0129566e9386711ea63"
- dependencies:
- fs-exists-sync "^0.1.0"
+detect-file@^1.0.0:
+ version "1.0.0"
+ resolved "https://registry.yarnpkg.com/detect-file/-/detect-file-1.0.0.tgz#f0d66d03672a825cb1b73bdb3fe62310c8e552b7"
+ integrity sha1-8NZtA2cqglyxtzvbP+YjEMjlUrc=
[email protected], detect-indent@^4.0.0:
- version "4.0.0"
- resolved "http://registry.npm.taobao.org/detect-indent/download/detect-indent-4.0.0.tgz#f76d064352cdf43a1cb6ce619c4ee3a9475de208"
- dependencies:
- repeating "^2.0.0"
[email protected]:
+ version "6.0.0"
+ resolved "https://registry.yarnpkg.com/detect-indent/-/detect-indent-6.0.0.tgz#0abd0f549f69fc6659a254fe96786186b6f528fd"
+ integrity sha512-oSyFlqaTHCItVRGK5RmrmjB+CmaMOW7IaNA/kdxqhoa6d17j/5ce9O9eWXmV/KEdRwqpQA+Vqe8a8Bsybu4YnA==
+
+detect-indent@^5.0.0:
+ version "5.0.0"
+ resolved "https://registry.yarnpkg.com/detect-indent/-/detect-indent-5.0.0.tgz#3871cc0a6a002e8c3e5b3cf7f336264675f06b9d"
+ integrity sha1-OHHMCmoALow+Wzz38zYmRnXwa50=
detect-libc@^1.0.2:
version "1.0.3"
- resolved "http://registry.npm.taobao.org/detect-libc/download/detect-libc-1.0.3.tgz#fa137c4bd698edf55cd5cd02ac559f91a4c4ba9b"
+ resolved "https://registry.yarnpkg.com/detect-libc/-/detect-libc-1.0.3.tgz#fa137c4bd698edf55cd5cd02ac559f91a4c4ba9b"
+ integrity sha1-+hN8S9aY7fVc1c0CrFWfkaTEups=
+
[email protected]:
+ version "3.0.0"
+ resolved "https://registry.yarnpkg.com/detect-newline/-/detect-newline-3.0.0.tgz#8ae477c089e51872c264531cd6547719c0b86b2f"
+ integrity sha512-JAP22dVPAqvhdRFFxK1G5GViIokyUn0UWXRNW0ztK96fsqi9cuM8w8ESbSk+T2w5OVorcMcL6m7yUg1RrX+2CA==
detect-newline@^2.1.0:
version "2.1.0"
- resolved "http://registry.npm.taobao.org/detect-newline/download/detect-newline-2.1.0.tgz#f41f1c10be4b00e87b5f13da680759f2c5bfd3e2"
-
-detect-node@^2.0.3:
- version "2.0.3"
- resolved "http://registry.npm.taobao.org/detect-node/download/detect-node-2.0.3.tgz#a2033c09cc8e158d37748fbde7507832bd6ce127"
-
[email protected]:
- version "1.1.6"
- resolved "http://registry.npm.taobao.org/detect-port-alt/download/detect-port-alt-1.1.6.tgz#24707deabe932d4a3cf621302027c2b266568275"
- dependencies:
- address "^1.0.1"
- debug "^2.6.0"
+ resolved "https://registry.yarnpkg.com/detect-newline/-/detect-newline-2.1.0.tgz#f41f1c10be4b00e87b5f13da680759f2c5bfd3e2"
+ integrity sha1-9B8cEL5LAOh7XxPaaAdZ8sW/0+I=
-dexie@^2.0.3:
+detect-node@^2.0.4:
version "2.0.4"
- resolved "http://registry.npm.taobao.org/dexie/download/dexie-2.0.4.tgz#6027a5e05879424e8f9979d8c14e7420f27e3a11"
+ resolved "https://registry.yarnpkg.com/detect-node/-/detect-node-2.0.4.tgz#014ee8f8f669c5c58023da64b8179c083a28c46c"
+ integrity sha512-ZIzRpLJrOj7jjP2miAtgqIfmzbxa4ZOr5jJc601zklsfEx9oTzmmj2nVpIPRpNlRTIh8lc1kyViIY7BWSGNmKw==
+
+diff-sequences@^24.3.0:
+ version "24.3.0"
+ resolved "https://registry.yarnpkg.com/diff-sequences/-/diff-sequences-24.3.0.tgz#0f20e8a1df1abddaf4d9c226680952e64118b975"
+ integrity sha512-xLqpez+Zj9GKSnPWS0WZw1igGocZ+uua8+y+5dDNTT934N3QuY1sp2LkHzwiaYQGz60hMq0pjAshdeXm5VUOEw==
-diff@^3.0.1, diff@^3.1.0, diff@^3.2.0:
+diff@^3.5.0:
version "3.5.0"
- resolved "http://registry.npm.taobao.org/diff/download/diff-3.5.0.tgz#800c0dd1e0a8bfbc95835c202ad220fe317e5a12"
+ resolved "https://registry.yarnpkg.com/diff/-/diff-3.5.0.tgz#800c0dd1e0a8bfbc95835c202ad220fe317e5a12"
+ integrity sha512-A46qtFgd+g7pDZinpnwiRJtxbC1hpgf0uzP3iG89scHk0AUC7A1TGxf5OiiOUv/JMZR8GOt8hL900hV0bOy5xA==
diffie-hellman@^5.0.0:
version "5.0.3"
- resolved "http://registry.npm.taobao.org/diffie-hellman/download/diffie-hellman-5.0.3.tgz#40e8ee98f55a2149607146921c63e1ae5f3d2875"
+ resolved "https://registry.yarnpkg.com/diffie-hellman/-/diffie-hellman-5.0.3.tgz#40e8ee98f55a2149607146921c63e1ae5f3d2875"
+ integrity sha512-kqag/Nl+f3GwyK25fhUMYj81BUOrZ9IuJsjIcDE5icNM9FJHAVm3VcUDxdLPoQtTuUylWm6ZIknYJwwaPxsUzg==
dependencies:
bn.js "^4.1.0"
miller-rabin "^4.0.0"
randombytes "^2.0.0"
dir-glob@^2.0.0:
- version "2.0.0"
- resolved "http://registry.npm.taobao.org/dir-glob/download/dir-glob-2.0.0.tgz#0b205d2b6aef98238ca286598a8204d29d0a0034"
+ version "2.2.2"
+ resolved "https://registry.yarnpkg.com/dir-glob/-/dir-glob-2.2.2.tgz#fa09f0694153c8918b18ba0deafae94769fc50c4"
+ integrity sha512-f9LBi5QWzIW3I6e//uxZoLBlUt9kcp66qo0sSCxL6YZKc75R1c4MFCoe/LaZiBGmgujvQdxc5Bn3QhfyvK5Hsw==
dependencies:
- arrify "^1.0.1"
path-type "^3.0.0"
[email protected]:
- version "1.0.0"
- resolved "http://registry.npm.taobao.org/discontinuous-range/download/discontinuous-range-1.0.0.tgz#e38331f0844bba49b9a9cb71c771585aab1bc65a"
+dir-glob@^3.0.1:
+ version "3.0.1"
+ resolved "https://registry.yarnpkg.com/dir-glob/-/dir-glob-3.0.1.tgz#56dbf73d992a4a93ba1584f4534063fd2e41717f"
+ integrity sha512-WkrWp9GR4KXfKGYzOLmTuGVi1UWFfws377n9cc55/tb6DuqyF6pcQ5AbiHEshaDpY9v6oaSr2XCDidGmMwdzIA==
+ dependencies:
+ path-type "^4.0.0"
dns-equal@^1.0.0:
version "1.0.0"
- resolved "http://registry.npm.taobao.org/dns-equal/download/dns-equal-1.0.0.tgz#b39e7f1da6eb0a75ba9c17324b34753c47e0654d"
+ resolved "https://registry.yarnpkg.com/dns-equal/-/dns-equal-1.0.0.tgz#b39e7f1da6eb0a75ba9c17324b34753c47e0654d"
+ integrity sha1-s55/HabrCnW6nBcySzR1PEfgZU0=
dns-packet@^1.3.1:
version "1.3.1"
- resolved "http://registry.npm.taobao.org/dns-packet/download/dns-packet-1.3.1.tgz#12aa426981075be500b910eedcd0b47dd7deda5a"
+ resolved "https://registry.yarnpkg.com/dns-packet/-/dns-packet-1.3.1.tgz#12aa426981075be500b910eedcd0b47dd7deda5a"
+ integrity sha512-0UxfQkMhYAUaZI+xrNZOz/as5KgDU0M/fQ9b6SpkyLbk3GEswDi6PADJVaYJradtRVsRIlF1zLyOodbcTCDzUg==
dependencies:
ip "^1.1.0"
safe-buffer "^5.0.1"
dns-txt@^2.0.2:
version "2.0.2"
- resolved "http://registry.npm.taobao.org/dns-txt/download/dns-txt-2.0.2.tgz#b91d806f5d27188e4ab3e7d107d881a1cc4642b6"
+ resolved "https://registry.yarnpkg.com/dns-txt/-/dns-txt-2.0.2.tgz#b91d806f5d27188e4ab3e7d107d881a1cc4642b6"
+ integrity sha1-uR2Ab10nGI5Ks+fRB9iBocxGQrY=
dependencies:
buffer-indexof "^1.0.0"
-doctrine@^0.7.2:
- version "0.7.2"
- resolved "http://registry.npm.taobao.org/doctrine/download/doctrine-0.7.2.tgz#7cb860359ba3be90e040b26b729ce4bfa654c523"
[email protected]:
+ version "1.5.0"
+ resolved "https://registry.yarnpkg.com/doctrine/-/doctrine-1.5.0.tgz#379dce730f6166f76cefa4e6707a159b02c5a6fa"
+ integrity sha1-N53Ocw9hZvds76TmcHoVmwLFpvo=
dependencies:
- esutils "^1.1.6"
- isarray "0.0.1"
+ esutils "^2.0.2"
+ isarray "^1.0.0"
[email protected]:
- version "1.6.7"
- resolved "http://registry.npm.taobao.org/dom-align/download/dom-align-1.6.7.tgz#6858138efb6b77405ce99146d0be5e4f7282813f"
+doctrine@^2.1.0:
+ version "2.1.0"
+ resolved "https://registry.yarnpkg.com/doctrine/-/doctrine-2.1.0.tgz#5cd01fc101621b42c4cd7f5d1a66243716d3f39d"
+ integrity sha512-35mSku4ZXK0vfCuHEDAwt55dg2jNajHZ1odvF+8SSr82EsZY4QmXfuWso8oEd8zRhVObSN18aM0CjSdoBX7zIw==
+ dependencies:
+ esutils "^2.0.2"
-dom-align@^1.7.0:
- version "1.8.0"
- resolved "http://registry.npm.taobao.org/dom-align/download/dom-align-1.8.0.tgz#c0e89b5b674c6e836cd248c52c2992135f093654"
- integrity sha1-wOibW2dMboNs0kjFLCmSE18JNlQ=
+doctrine@^3.0.0:
+ version "3.0.0"
+ resolved "https://registry.yarnpkg.com/doctrine/-/doctrine-3.0.0.tgz#addebead72a6574db783639dc87a121773973961"
+ integrity sha512-yS+Q5i3hBf7GBkd4KG8a7eBNNWNGLTaEwwYWUijIYM7zrlYDM0BFXHjjPWlWZ1Rg7UaddZeIDmi9jF3HmqiQ2w==
+ dependencies:
+ esutils "^2.0.2"
-dom-closest@^0.2.0:
+dom-converter@^0.2:
version "0.2.0"
- resolved "http://registry.npm.taobao.org/dom-closest/download/dom-closest-0.2.0.tgz#ebd9f91d1bf22e8d6f477876bbcd3ec90216c0cf"
+ resolved "https://registry.yarnpkg.com/dom-converter/-/dom-converter-0.2.0.tgz#6721a9daee2e293682955b6afe416771627bb768"
+ integrity sha512-gd3ypIPfOMr9h5jIKq8E3sHOTCjeirnl0WK5ZdS1AW0Odt0b1PaWaHdJ4Qk4klv+YB9aJBS7mESXjFoDQPu6DA==
dependencies:
- dom-matches ">=1.0.1"
+ utila "~0.4"
-dom-converter@~0.1:
- version "0.1.4"
- resolved "http://registry.npm.taobao.org/dom-converter/download/dom-converter-0.1.4.tgz#a45ef5727b890c9bffe6d7c876e7b19cb0e17f3b"
+dom-serializer@0:
+ version "0.1.1"
+ resolved "https://registry.yarnpkg.com/dom-serializer/-/dom-serializer-0.1.1.tgz#1ec4059e284babed36eec2941d4a970a189ce7c0"
+ integrity sha512-l0IU0pPzLWSHBcieZbpOKgkIn3ts3vAh7ZuFyXNwJxJXk/c4Gwj9xaTJwIDVQCXawWD0qb3IzMGH5rglQaO0XA==
dependencies:
- utila "~0.3"
-
-dom-helpers@^3.3.1:
- version "3.3.1"
- resolved "http://registry.npm.taobao.org/dom-helpers/download/dom-helpers-3.3.1.tgz#fc1a4e15ffdf60ddde03a480a9c0fece821dd4a6"
-
-dom-matches@>=1.0.1:
- version "2.0.0"
- resolved "http://registry.npm.taobao.org/dom-matches/download/dom-matches-2.0.0.tgz#d2728b416a87533980eb089b848d253cf23a758c"
-
[email protected], dom-scroll-into-view@^1.2.0:
- version "1.2.1"
- resolved "http://registry.npm.taobao.org/dom-scroll-into-view/download/dom-scroll-into-view-1.2.1.tgz#e8f36732dd089b0201a88d7815dc3f88e6d66c7e"
+ domelementtype "^1.3.0"
+ entities "^1.1.1"
-dom-serializer@0, dom-serializer@~0.1.0:
- version "0.1.0"
- resolved "http://registry.npm.taobao.org/dom-serializer/download/dom-serializer-0.1.0.tgz#073c697546ce0780ce23be4a28e293e40bc30c82"
- dependencies:
- domelementtype "~1.1.1"
- entities "~1.1.1"
+dom-walk@^0.1.0:
+ version "0.1.1"
+ resolved "https://registry.yarnpkg.com/dom-walk/-/dom-walk-0.1.1.tgz#672226dc74c8f799ad35307df936aba11acd6018"
+ integrity sha1-ZyIm3HTI95mtNTB9+TaroRrNYBg=
domain-browser@^1.1.1:
version "1.2.0"
- resolved "http://registry.npm.taobao.org/domain-browser/download/domain-browser-1.2.0.tgz#3d31f50191a6749dd1375a7f522e823d42e54eda"
-
-domelementtype@1, domelementtype@^1.3.0:
- version "1.3.0"
- resolved "http://registry.npm.taobao.org/domelementtype/download/domelementtype-1.3.0.tgz#b17aed82e8ab59e52dd9c19b1756e0fc187204c2"
+ resolved "https://registry.yarnpkg.com/domain-browser/-/domain-browser-1.2.0.tgz#3d31f50191a6749dd1375a7f522e823d42e54eda"
+ integrity sha512-jnjyiM6eRyZl2H+W8Q/zLMA481hzi0eszAaBUzIVnmYVDBbnLxVNnfu1HgEBvCbL+71FrxMl3E6lpKH7Ge3OXA==
-domelementtype@~1.1.1:
- version "1.1.3"
- resolved "http://registry.npm.taobao.org/domelementtype/download/domelementtype-1.1.3.tgz#bd28773e2642881aec51544924299c5cd822185b"
+domelementtype@1, domelementtype@^1.3.0, domelementtype@^1.3.1:
+ version "1.3.1"
+ resolved "https://registry.yarnpkg.com/domelementtype/-/domelementtype-1.3.1.tgz#d048c44b37b0d10a7f2a3d5fee3f4333d790481f"
+ integrity sha512-BSKB+TSpMpFI/HOxCNr1O8aMOTZ8hT3pM3GQ0w/mWRmkhEDSFJkkyzz4XQsBV44BChwGkrDfMyjVD0eA2aFV3w==
-domexception@^1.0.0:
+domexception@^1.0.1:
version "1.0.1"
- resolved "http://registry.npm.taobao.org/domexception/download/domexception-1.0.1.tgz#937442644ca6a31261ef36e3ec677fe805582c90"
+ resolved "https://registry.yarnpkg.com/domexception/-/domexception-1.0.1.tgz#937442644ca6a31261ef36e3ec677fe805582c90"
+ integrity sha512-raigMkn7CJNNo6Ihro1fzG7wr3fHuYVytzquZKX5n0yizGsTcYgzdIUwj1X9pK0VvjeihV+XiclP+DjwbsSKug==
dependencies:
webidl-conversions "^4.0.2"
[email protected]:
- version "2.1.0"
- resolved "http://registry.npm.taobao.org/domhandler/download/domhandler-2.1.0.tgz#d2646f5e57f6c3bab11cf6cb05d3c0acf7412594"
- dependencies:
- domelementtype "1"
-
domhandler@^2.3.0:
version "2.4.2"
- resolved "http://registry.npm.taobao.org/domhandler/download/domhandler-2.4.2.tgz#8805097e933d65e85546f726d60f5eb88b44f803"
- dependencies:
- domelementtype "1"
-
-dompurify@^1.0.4:
- version "1.0.4"
- resolved "http://registry.npm.taobao.org/dompurify/download/dompurify-1.0.4.tgz#b0655d07856c1ef76fd27ae18e8ab1174ed18819"
-
[email protected]:
- version "1.1.6"
- resolved "http://registry.npm.taobao.org/domutils/download/domutils-1.1.6.tgz#bddc3de099b9a2efacc51c623f28f416ecc57485"
+ resolved "https://registry.yarnpkg.com/domhandler/-/domhandler-2.4.2.tgz#8805097e933d65e85546f726d60f5eb88b44f803"
+ integrity sha512-JiK04h0Ht5u/80fdLMCEmV4zkNh2BcoMFBmZ/91WtYZ8qVXSKjiw7fXMgFPnHcSZgOo3XdinHvmnDUeMf5R4wA==
dependencies:
domelementtype "1"
[email protected]:
version "1.5.1"
- resolved "http://registry.npm.taobao.org/domutils/download/domutils-1.5.1.tgz#dcd8488a26f563d61079e48c9f7b7e32373682cf"
+ resolved "https://registry.yarnpkg.com/domutils/-/domutils-1.5.1.tgz#dcd8488a26f563d61079e48c9f7b7e32373682cf"
+ integrity sha1-3NhIiib1Y9YQeeSMn3t+Mjc2gs8=
dependencies:
dom-serializer "0"
domelementtype "1"
domutils@^1.5.1:
version "1.7.0"
- resolved "http://registry.npm.taobao.org/domutils/download/domutils-1.7.0.tgz#56ea341e834e06e6748af7a1cb25da67ea9f8c2a"
+ resolved "https://registry.yarnpkg.com/domutils/-/domutils-1.7.0.tgz#56ea341e834e06e6748af7a1cb25da67ea9f8c2a"
+ integrity sha512-Lgd2XcJ/NjEw+7tFvfKxOzCYKZsdct5lczQ2ZaQY8Djz7pfAD3Gbp8ySJWtreII/vDlMVmxwa6pHmdxIYgttDg==
dependencies:
dom-serializer "0"
domelementtype "1"
dot-prop@^3.0.0:
version "3.0.0"
- resolved "http://registry.npm.taobao.org/dot-prop/download/dot-prop-3.0.0.tgz#1b708af094a49c9a0e7dbcad790aba539dac1177"
+ resolved "https://registry.yarnpkg.com/dot-prop/-/dot-prop-3.0.0.tgz#1b708af094a49c9a0e7dbcad790aba539dac1177"
+ integrity sha1-G3CK8JSknJoOfbyteQq6U52sEXc=
dependencies:
is-obj "^1.0.0"
[email protected]:
- version "5.0.1"
- resolved "http://registry.npm.taobao.org/dotenv/download/dotenv-5.0.1.tgz#a5317459bd3d79ab88cff6e44057a6a3fbb1fcef"
-
-dotgitignore@^1.0.3:
- version "1.0.3"
- resolved "http://registry.npm.taobao.org/dotgitignore/download/dotgitignore-1.0.3.tgz#a442cbde7dc20dff51cdb849e4c5a64568c07923"
[email protected]:
+ version "2.1.0"
+ resolved "https://registry.yarnpkg.com/dotgitignore/-/dotgitignore-2.1.0.tgz#a4b15a4e4ef3cf383598aaf1dfa4a04bcc089b7b"
+ integrity sha512-sCm11ak2oY6DglEPpCB8TixLjWAxd3kJTs6UIcSasNYxXdFPV+YKlye92c8H4kKFqV5qYMIh7d+cYecEg0dIkA==
dependencies:
- find-up "^2.1.0"
+ find-up "^3.0.0"
minimatch "^3.0.4"
-draft-js@^0.10.0, draft-js@~0.10.0:
- version "0.10.5"
- resolved "http://registry.npm.taobao.org/draft-js/download/draft-js-0.10.5.tgz#bfa9beb018fe0533dbb08d6675c371a6b08fa742"
- dependencies:
- fbjs "^0.8.15"
- immutable "~3.7.4"
- object-assign "^4.1.0"
-
-duplexer@^0.1.1:
- version "0.1.1"
- resolved "http://registry.npm.taobao.org/duplexer/download/duplexer-0.1.1.tgz#ace6ff808c1ce66b57d1ebf97977acb02334cfc1"
-
duplexify@^3.4.2, duplexify@^3.6.0:
- version "3.6.0"
- resolved "http://registry.npm.taobao.org/duplexify/download/duplexify-3.6.0.tgz#592903f5d80b38d037220541264d69a198fb3410"
+ version "3.7.1"
+ resolved "https://registry.yarnpkg.com/duplexify/-/duplexify-3.7.1.tgz#2a4df5317f6ccfd91f86d6fd25d8d8a103b88309"
+ integrity sha512-07z8uv2wMyS51kKhD1KsdXJg5WQ6t93RneqRxUHnskXVtlYYkLqM0gqStQZ3pj073g687jPCHrqNfCzawLYh5g==
dependencies:
end-of-stream "^1.0.0"
inherits "^2.0.1"
@@ -3083,26 +3417,27 @@ duplexify@^3.4.2, duplexify@^3.6.0:
stream-shift "^1.0.0"
ecc-jsbn@~0.1.1:
- version "0.1.1"
- resolved "http://registry.npm.taobao.org/ecc-jsbn/download/ecc-jsbn-0.1.1.tgz#0fc73a9ed5f0d53c38193398523ef7e543777505"
+ version "0.1.2"
+ resolved "https://registry.yarnpkg.com/ecc-jsbn/-/ecc-jsbn-0.1.2.tgz#3a83a904e54353287874c564b7549386849a98c9"
+ integrity sha1-OoOpBOVDUyh4dMVkt1SThoSamMk=
dependencies:
jsbn "~0.1.0"
+ safer-buffer "^2.1.0"
[email protected]:
version "1.1.1"
- resolved "http://registry.npm.taobao.org/ee-first/download/ee-first-1.1.1.tgz#590c61156b0ae2f4f0255732a158b266bc56b21d"
-
-ejs@^2.5.7:
- version "2.6.1"
- resolved "http://registry.npm.taobao.org/ejs/download/ejs-2.6.1.tgz#498ec0d495655abc6f23cd61868d926464071aa0"
+ resolved "https://registry.yarnpkg.com/ee-first/-/ee-first-1.1.1.tgz#590c61156b0ae2f4f0255732a158b266bc56b21d"
+ integrity sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0=
-electron-to-chromium@^1.2.7, electron-to-chromium@^1.3.47:
- version "1.3.48"
- resolved "http://registry.npm.taobao.org/electron-to-chromium/download/electron-to-chromium-1.3.48.tgz#d3b0d8593814044e092ece2108fc3ac9aea4b900"
+electron-to-chromium@^1.3.164:
+ version "1.3.187"
+ resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.187.tgz#fea64435f370892c0f27aded1bbdcb6f235c592b"
+ integrity sha512-XCEygaK7Fs35/RwS+67YbBWs/ydG+oUFPuy1wv558jC3Opd2DHwRyRqrCmhxpmPmCSVlZujYX4TOmOXuMz2GZA==
elliptic@^6.0.0:
- version "6.4.0"
- resolved "http://registry.npm.taobao.org/elliptic/download/elliptic-6.4.0.tgz#cac9af8762c85836187003c8dfe193e5e2eae5df"
+ version "6.5.0"
+ resolved "https://registry.yarnpkg.com/elliptic/-/elliptic-6.5.0.tgz#2b8ed4c891b7de3200e14412a5b8248c7af505ca"
+ integrity sha512-eFOJTMyCYb7xtE/caJ6JJu+bhi67WCYNbkGSknu20pmM8Ke/bqOfdnZWxyoGN26JgfxTbXrsCkEw4KheCT/KGg==
dependencies:
bn.js "^4.4.0"
brorand "^1.0.1"
@@ -3112,285 +3447,346 @@ elliptic@^6.0.0:
minimalistic-assert "^1.0.0"
minimalistic-crypto-utils "^1.0.0"
+emoji-regex@^7.0.1:
+ version "7.0.3"
+ resolved "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-7.0.3.tgz#933a04052860c85e83c122479c4748a8e4c72156"
+ integrity sha512-CwBLREIQ7LvYFB0WyRvwhq5N5qPhc6PMjD6bYggFlI5YyDgl+0vxq5VHbMOFqLg7hfWzmu8T5Z1QofhmTIhItA==
+
emojis-list@^2.0.0:
version "2.1.0"
- resolved "http://registry.npm.taobao.org/emojis-list/download/emojis-list-2.1.0.tgz#4daa4d9db00f9819880c79fa457ae5b09a1fd389"
+ resolved "https://registry.yarnpkg.com/emojis-list/-/emojis-list-2.1.0.tgz#4daa4d9db00f9819880c79fa457ae5b09a1fd389"
+ integrity sha1-TapNnbAPmBmIDHn6RXrlsJof04k=
encodeurl@~1.0.2:
version "1.0.2"
- resolved "http://registry.npm.taobao.org/encodeurl/download/encodeurl-1.0.2.tgz#ad3ff4c86ec2d029322f5a02c3a9a606c95b3f59"
-
-encoding@^0.1.11:
- version "0.1.12"
- resolved "http://registry.npm.taobao.org/encoding/download/encoding-0.1.12.tgz#538b66f3ee62cd1ab51ec323829d1f9480c74beb"
- dependencies:
- iconv-lite "~0.4.13"
+ resolved "https://registry.yarnpkg.com/encodeurl/-/encodeurl-1.0.2.tgz#ad3ff4c86ec2d029322f5a02c3a9a606c95b3f59"
+ integrity sha1-rT/0yG7C0CkyL1oCw6mmBslbP1k=
end-of-stream@^1.0.0, end-of-stream@^1.1.0:
version "1.4.1"
- resolved "http://registry.npm.taobao.org/end-of-stream/download/end-of-stream-1.4.1.tgz#ed29634d19baba463b6ce6b80a37213eab71ec43"
+ resolved "https://registry.yarnpkg.com/end-of-stream/-/end-of-stream-1.4.1.tgz#ed29634d19baba463b6ce6b80a37213eab71ec43"
+ integrity sha512-1MkrZNvWTKCaigbn+W15elq2BB/L22nqrSY5DKlo3X6+vclJm8Bb5djXJBmEX6fS3+zCh/F4VBK5Z2KxJt4s2Q==
dependencies:
once "^1.4.0"
-enhanced-resolve@^3.0.0, enhanced-resolve@^3.4.0:
- version "3.4.1"
- resolved "http://registry.npm.taobao.org/enhanced-resolve/download/enhanced-resolve-3.4.1.tgz#0421e339fd71419b3da13d129b3979040230476e"
[email protected], enhanced-resolve@^4.1.0:
+ version "4.1.0"
+ resolved "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-4.1.0.tgz#41c7e0bfdfe74ac1ffe1e57ad6a5c6c9f3742a7f"
+ integrity sha512-F/7vkyTtyc/llOIn8oWclcB25KdRaiPBpZYDgJHgh/UHtpgT2p2eldQgtQnLtUvfMKPKxbRaQM/hHkvLHt1Vng==
dependencies:
graceful-fs "^4.1.2"
memory-fs "^0.4.0"
- object-assign "^4.0.1"
- tapable "^0.2.7"
-
-enquire.js@^2.1.1, enquire.js@^2.1.6:
- version "2.1.6"
- resolved "http://registry.npm.taobao.org/enquire.js/download/enquire.js-2.1.6.tgz#3e8780c9b8b835084c3f60e166dbc3c2a3c89814"
- integrity sha1-PoeAybi4NQhMP2DhZtvDwqPImBQ=
-
-entities@^1.1.1, entities@~1.1.1:
- version "1.1.1"
- resolved "http://registry.npm.taobao.org/entities/download/entities-1.1.1.tgz#6e5c2d0a5621b5dadaecef80b90edfb5cd7772f0"
-
-enzyme-adapter-react-16@^1.1.1:
- version "1.1.1"
- resolved "http://registry.npm.taobao.org/enzyme-adapter-react-16/download/enzyme-adapter-react-16-1.1.1.tgz#a8f4278b47e082fbca14f5bfb1ee50ee650717b4"
- dependencies:
- enzyme-adapter-utils "^1.3.0"
- lodash "^4.17.4"
- object.assign "^4.0.4"
- object.values "^1.0.4"
- prop-types "^15.6.0"
- react-reconciler "^0.7.0"
- react-test-renderer "^16.0.0-0"
-
-enzyme-adapter-utils@^1.3.0:
- version "1.3.0"
- resolved "http://registry.npm.taobao.org/enzyme-adapter-utils/download/enzyme-adapter-utils-1.3.0.tgz#d6c85756826c257a8544d362cc7a67e97ea698c7"
- dependencies:
- lodash "^4.17.4"
- object.assign "^4.0.4"
- prop-types "^15.6.0"
-
-enzyme-to-json@^3.3.3:
- version "3.3.4"
- resolved "http://registry.npm.taobao.org/enzyme-to-json/download/enzyme-to-json-3.3.4.tgz#67c6040e931182f183418af2eb9f4323258aa77f"
- dependencies:
- lodash "^4.17.4"
+ tapable "^1.0.0"
-enzyme@^3.3.0:
- version "3.3.0"
- resolved "http://registry.npm.taobao.org/enzyme/download/enzyme-3.3.0.tgz#0971abd167f2d4bf3f5bd508229e1c4b6dc50479"
- dependencies:
- cheerio "^1.0.0-rc.2"
- function.prototype.name "^1.0.3"
- has "^1.0.1"
- is-boolean-object "^1.0.0"
- is-callable "^1.1.3"
- is-number-object "^1.0.3"
- is-string "^1.0.4"
- is-subset "^0.1.1"
- lodash "^4.17.4"
- object-inspect "^1.5.0"
- object-is "^1.0.1"
- object.assign "^4.1.0"
- object.entries "^1.0.4"
- object.values "^1.0.4"
- raf "^3.4.0"
- rst-selector-parser "^2.2.3"
+entities@^1.1.1:
+ version "1.1.2"
+ resolved "https://registry.yarnpkg.com/entities/-/entities-1.1.2.tgz#bdfa735299664dfafd34529ed4f8522a275fea56"
+ integrity sha512-f2LZMYl1Fzu7YSBKg+RoROelpOaNrcGmE9AZubeDfrCEia483oW4MI4VyFd5VNHIgQ/7qm1I0wUHK1eJnn2y2w==
errno@^0.1.3, errno@~0.1.7:
version "0.1.7"
- resolved "http://registry.npm.taobao.org/errno/download/errno-0.1.7.tgz#4684d71779ad39af177e3f007996f7c67c852618"
+ resolved "https://registry.yarnpkg.com/errno/-/errno-0.1.7.tgz#4684d71779ad39af177e3f007996f7c67c852618"
+ integrity sha512-MfrRBDWzIWifgq6tJj60gkAwtLNb6sQPlcFrSOflcP1aFmmruKQ2wRnze/8V6kgyz7H3FF8Npzv78mZ7XLLflg==
dependencies:
prr "~1.0.1"
error-ex@^1.2.0, error-ex@^1.3.1:
- version "1.3.1"
- resolved "http://registry.npm.taobao.org/error-ex/download/error-ex-1.3.1.tgz#f855a86ce61adc4e8621c3cda21e7a7612c3a8dc"
+ version "1.3.2"
+ resolved "https://registry.yarnpkg.com/error-ex/-/error-ex-1.3.2.tgz#b4ac40648107fdcdcfae242f428bea8a14d4f1bf"
+ integrity sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g==
dependencies:
is-arrayish "^0.2.1"
-es-abstract@^1.5.1, es-abstract@^1.6.1, es-abstract@^1.7.0:
- version "1.11.0"
- resolved "http://registry.npm.taobao.org/es-abstract/download/es-abstract-1.11.0.tgz#cce87d518f0496893b1a30cd8461835535480681"
+es-abstract@^1.11.0, es-abstract@^1.12.0, es-abstract@^1.5.1, es-abstract@^1.7.0:
+ version "1.13.0"
+ resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.13.0.tgz#ac86145fdd5099d8dd49558ccba2eaf9b88e24e9"
+ integrity sha512-vDZfg/ykNxQVwup/8E1BZhVzFfBxs9NqMzGcvIJrqg5k2/5Za2bWo40dK2J1pgLngZ7c+Shh8lwYtLGyrwPutg==
dependencies:
- es-to-primitive "^1.1.1"
+ es-to-primitive "^1.2.0"
function-bind "^1.1.1"
- has "^1.0.1"
- is-callable "^1.1.3"
+ has "^1.0.3"
+ is-callable "^1.1.4"
is-regex "^1.0.4"
+ object-keys "^1.0.12"
-es-to-primitive@^1.1.1:
- version "1.1.1"
- resolved "http://registry.npm.taobao.org/es-to-primitive/download/es-to-primitive-1.1.1.tgz#45355248a88979034b6792e19bb81f2b7975dd0d"
+es-to-primitive@^1.2.0:
+ version "1.2.0"
+ resolved "https://registry.yarnpkg.com/es-to-primitive/-/es-to-primitive-1.2.0.tgz#edf72478033456e8dda8ef09e00ad9650707f377"
+ integrity sha512-qZryBOJjV//LaxLTV6UC//WewneB3LcXOL9NP++ozKVXsIIIpm/2c13UDiD9Jp2eThsecw9m3jPqDwTyobcdbg==
dependencies:
- is-callable "^1.1.1"
+ is-callable "^1.1.4"
is-date-object "^1.0.1"
- is-symbol "^1.0.1"
+ is-symbol "^1.0.2"
-es5-ext@^0.10.14, es5-ext@^0.10.35, es5-ext@^0.10.9, es5-ext@~0.10.14:
- version "0.10.42"
- resolved "http://registry.npm.taobao.org/es5-ext/download/es5-ext-0.10.42.tgz#8c07dd33af04d5dcd1310b5cef13bea63a89ba8d"
+es6-templates@^0.2.3:
+ version "0.2.3"
+ resolved "https://registry.yarnpkg.com/es6-templates/-/es6-templates-0.2.3.tgz#5cb9ac9fb1ded6eb1239342b81d792bbb4078ee4"
+ integrity sha1-XLmsn7He1usSOTQrgdeSu7QHjuQ=
dependencies:
- es6-iterator "~2.0.3"
- es6-symbol "~3.1.1"
- next-tick "1"
+ recast "~0.11.12"
+ through "~2.3.6"
-es6-iterator@^2.0.1, es6-iterator@~2.0.1, es6-iterator@~2.0.3:
- version "2.0.3"
- resolved "http://registry.npm.taobao.org/es6-iterator/download/es6-iterator-2.0.3.tgz#a7de889141a05a94b0854403b2d0a0fbfa98f3b7"
+escape-html@~1.0.3:
+ version "1.0.3"
+ resolved "https://registry.yarnpkg.com/escape-html/-/escape-html-1.0.3.tgz#0258eae4d3d0c0974de1c169188ef0051d1d1988"
+ integrity sha1-Aljq5NPQwJdN4cFpGI7wBR0dGYg=
+
+escape-string-regexp@^1.0.5:
+ version "1.0.5"
+ resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz#1b61c0562190a8dff6ae3bb2cf0200ca130b86d4"
+ integrity sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=
+
+escodegen@^1.9.1:
+ version "1.11.1"
+ resolved "https://registry.yarnpkg.com/escodegen/-/escodegen-1.11.1.tgz#c485ff8d6b4cdb89e27f4a856e91f118401ca510"
+ integrity sha512-JwiqFD9KdGVVpeuRa68yU3zZnBEOcPs0nKW7wZzXky8Z7tffdYUHbe11bPCV5jYlK6DVdKLWLm0f5I/QlL0Kmw==
dependencies:
- d "1"
- es5-ext "^0.10.35"
- es6-symbol "^3.1.1"
+ esprima "^3.1.3"
+ estraverse "^4.2.0"
+ esutils "^2.0.2"
+ optionator "^0.8.1"
+ optionalDependencies:
+ source-map "~0.6.1"
-es6-map@^0.1.3:
- version "0.1.5"
- resolved "http://registry.npm.taobao.org/es6-map/download/es6-map-0.1.5.tgz#9136e0503dcc06a301690f0bb14ff4e364e949f0"
+eslint-config-prettier@^6.0.0:
+ version "6.0.0"
+ resolved "https://registry.yarnpkg.com/eslint-config-prettier/-/eslint-config-prettier-6.0.0.tgz#f429a53bde9fc7660e6353910fd996d6284d3c25"
+ integrity sha512-vDrcCFE3+2ixNT5H83g28bO/uYAwibJxerXPj+E7op4qzBCsAV36QfvdAyVOoNxKAH2Os/e01T/2x++V0LPukA==
dependencies:
- d "1"
- es5-ext "~0.10.14"
- es6-iterator "~2.0.1"
- es6-set "~0.1.5"
- es6-symbol "~3.1.1"
- event-emitter "~0.3.5"
+ get-stdin "^6.0.0"
-es6-set@~0.1.5:
- version "0.1.5"
- resolved "http://registry.npm.taobao.org/es6-set/download/es6-set-0.1.5.tgz#d2b3ec5d4d800ced818db538d28974db0a73ccb1"
+eslint-config-standard@^12.0.0:
+ version "12.0.0"
+ resolved "https://registry.yarnpkg.com/eslint-config-standard/-/eslint-config-standard-12.0.0.tgz#638b4c65db0bd5a41319f96bba1f15ddad2107d9"
+ integrity sha512-COUz8FnXhqFitYj4DTqHzidjIL/t4mumGZto5c7DrBpvWoie+Sn3P4sLEzUGeYhRElWuFEf8K1S1EfvD1vixCQ==
+
+eslint-import-resolver-node@^0.3.2:
+ version "0.3.2"
+ resolved "https://registry.yarnpkg.com/eslint-import-resolver-node/-/eslint-import-resolver-node-0.3.2.tgz#58f15fb839b8d0576ca980413476aab2472db66a"
+ integrity sha512-sfmTqJfPSizWu4aymbPr4Iidp5yKm8yDkHp+Ir3YiTHiiDfxh69mOUsmiqW6RZ9zRXFaF64GtYmN7e+8GHBv6Q==
dependencies:
- d "1"
- es5-ext "~0.10.14"
- es6-iterator "~2.0.1"
- es6-symbol "3.1.1"
- event-emitter "~0.3.5"
+ debug "^2.6.9"
+ resolve "^1.5.0"
[email protected], es6-symbol@^3.1.1, es6-symbol@~3.1.1:
- version "3.1.1"
- resolved "http://registry.npm.taobao.org/es6-symbol/download/es6-symbol-3.1.1.tgz#bf00ef4fdab6ba1b46ecb7b629b4c7ed5715cc77"
+eslint-module-utils@^2.4.0:
+ version "2.4.0"
+ resolved "https://registry.yarnpkg.com/eslint-module-utils/-/eslint-module-utils-2.4.0.tgz#8b93499e9b00eab80ccb6614e69f03678e84e09a"
+ integrity sha512-14tltLm38Eu3zS+mt0KvILC3q8jyIAH518MlG+HO0p+yK885Lb1UHTY/UgR91eOyGdmxAPb+OLoW4znqIT6Ndw==
dependencies:
- d "1"
- es5-ext "~0.10.14"
+ debug "^2.6.8"
+ pkg-dir "^2.0.0"
-es6-weak-map@^2.0.1:
- version "2.0.2"
- resolved "http://registry.npm.taobao.org/es6-weak-map/download/es6-weak-map-2.0.2.tgz#5e3ab32251ffd1538a1f8e5ffa1357772f92d96f"
+eslint-plugin-es@^1.4.0:
+ version "1.4.0"
+ resolved "https://registry.yarnpkg.com/eslint-plugin-es/-/eslint-plugin-es-1.4.0.tgz#475f65bb20c993fc10e8c8fe77d1d60068072da6"
+ integrity sha512-XfFmgFdIUDgvaRAlaXUkxrRg5JSADoRC8IkKLc/cISeR3yHVMefFHQZpcyXXEUUPHfy5DwviBcrfqlyqEwlQVw==
dependencies:
- d "1"
- es5-ext "^0.10.14"
- es6-iterator "^2.0.1"
- es6-symbol "^3.1.1"
+ eslint-utils "^1.3.0"
+ regexpp "^2.0.1"
-escape-html@~1.0.3:
- version "1.0.3"
- resolved "http://registry.npm.taobao.org/escape-html/download/escape-html-1.0.3.tgz#0258eae4d3d0c0974de1c169188ef0051d1d1988"
+eslint-plugin-import@^2.18.0:
+ version "2.18.0"
+ resolved "https://registry.yarnpkg.com/eslint-plugin-import/-/eslint-plugin-import-2.18.0.tgz#7a5ba8d32622fb35eb9c8db195c2090bd18a3678"
+ integrity sha512-PZpAEC4gj/6DEMMoU2Df01C5c50r7zdGIN52Yfi7CvvWaYssG7Jt5R9nFG5gmqodxNOz9vQS87xk6Izdtpdrig==
+ dependencies:
+ array-includes "^3.0.3"
+ contains-path "^0.1.0"
+ debug "^2.6.9"
+ doctrine "1.5.0"
+ eslint-import-resolver-node "^0.3.2"
+ eslint-module-utils "^2.4.0"
+ has "^1.0.3"
+ lodash "^4.17.11"
+ minimatch "^3.0.4"
+ read-pkg-up "^2.0.0"
+ resolve "^1.11.0"
[email protected], escape-string-regexp@^1.0.2, escape-string-regexp@^1.0.5:
- version "1.0.5"
- resolved "http://registry.npm.taobao.org/escape-string-regexp/download/escape-string-regexp-1.0.5.tgz#1b61c0562190a8dff6ae3bb2cf0200ca130b86d4"
+eslint-plugin-node@^9.1.0:
+ version "9.1.0"
+ resolved "https://registry.yarnpkg.com/eslint-plugin-node/-/eslint-plugin-node-9.1.0.tgz#f2fd88509a31ec69db6e9606d76dabc5adc1b91a"
+ integrity sha512-ZwQYGm6EoV2cfLpE1wxJWsfnKUIXfM/KM09/TlorkukgCAwmkgajEJnPCmyzoFPQQkmvo5DrW/nyKutNIw36Mw==
+ dependencies:
+ eslint-plugin-es "^1.4.0"
+ eslint-utils "^1.3.1"
+ ignore "^5.1.1"
+ minimatch "^3.0.4"
+ resolve "^1.10.1"
+ semver "^6.1.0"
-escodegen@^1.9.0:
- version "1.9.1"
- resolved "http://registry.npm.taobao.org/escodegen/download/escodegen-1.9.1.tgz#dbae17ef96c8e4bedb1356f4504fa4cc2f7cb7e2"
+eslint-plugin-prettier@^3.1.0:
+ version "3.1.0"
+ resolved "https://registry.yarnpkg.com/eslint-plugin-prettier/-/eslint-plugin-prettier-3.1.0.tgz#8695188f95daa93b0dc54b249347ca3b79c4686d"
+ integrity sha512-XWX2yVuwVNLOUhQijAkXz+rMPPoCr7WFiAl8ig6I7Xn+pPVhDhzg4DxHpmbeb0iqjO9UronEA3Tb09ChnFVHHA==
dependencies:
- esprima "^3.1.3"
- estraverse "^4.2.0"
- esutils "^2.0.2"
- optionator "^0.8.1"
- optionalDependencies:
- source-map "~0.6.1"
+ prettier-linter-helpers "^1.0.0"
-escope@^3.6.0:
- version "3.6.0"
- resolved "http://registry.npm.taobao.org/escope/download/escope-3.6.0.tgz#e01975e812781a163a6dadfdd80398dc64c889c3"
+eslint-plugin-promise@^4.2.1:
+ version "4.2.1"
+ resolved "https://registry.yarnpkg.com/eslint-plugin-promise/-/eslint-plugin-promise-4.2.1.tgz#845fd8b2260ad8f82564c1222fce44ad71d9418a"
+ integrity sha512-VoM09vT7bfA7D+upt+FjeBO5eHIJQBUWki1aPvB+vbNiHS3+oGIJGIeyBtKQTME6UPXXy3vV07OL1tHd3ANuDw==
+
+eslint-plugin-react-hooks@^1.6.0:
+ version "1.6.1"
+ resolved "https://registry.yarnpkg.com/eslint-plugin-react-hooks/-/eslint-plugin-react-hooks-1.6.1.tgz#3c66a5515ea3e0a221ffc5d4e75c971c217b1a4c"
+ integrity sha512-wHhmGJyVuijnYIJXZJHDUF2WM+rJYTjulUTqF9k61d3BTk8etydz+M4dXUVH7M76ZRS85rqBTCx0Es/lLsrjnA==
+
+eslint-plugin-react@^7.12.4, eslint-plugin-react@^7.14.2:
+ version "7.14.2"
+ resolved "https://registry.yarnpkg.com/eslint-plugin-react/-/eslint-plugin-react-7.14.2.tgz#94c193cc77a899ac0ecbb2766fbef88685b7ecc1"
+ integrity sha512-jZdnKe3ip7FQOdjxks9XPN0pjUKZYq48OggNMd16Sk+8VXx6JOvXmlElxROCgp7tiUsTsze3jd78s/9AFJP2mA==
+ dependencies:
+ array-includes "^3.0.3"
+ doctrine "^2.1.0"
+ has "^1.0.3"
+ jsx-ast-utils "^2.1.0"
+ object.entries "^1.1.0"
+ object.fromentries "^2.0.0"
+ object.values "^1.1.0"
+ prop-types "^15.7.2"
+ resolve "^1.10.1"
+
+eslint-plugin-standard@^4.0.0:
+ version "4.0.0"
+ resolved "https://registry.yarnpkg.com/eslint-plugin-standard/-/eslint-plugin-standard-4.0.0.tgz#f845b45109c99cd90e77796940a344546c8f6b5c"
+ integrity sha512-OwxJkR6TQiYMmt1EsNRMe5qG3GsbjlcOhbGUBY4LtavF9DsLaTcoR+j2Tdjqi23oUwKNUqX7qcn5fPStafMdlA==
+
+eslint-scope@^4.0.0, eslint-scope@^4.0.3:
+ version "4.0.3"
+ resolved "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-4.0.3.tgz#ca03833310f6889a3264781aa82e63eb9cfe7848"
+ integrity sha512-p7VutNr1O/QrxysMo3E45FjYDTeXBy0iTltPFNSqKAIfjDSXC+4dj+qfyuD8bfAXrW/y6lW3O76VaYNPKfpKrg==
dependencies:
- es6-map "^0.1.3"
- es6-weak-map "^2.0.1"
esrecurse "^4.1.0"
estraverse "^4.1.1"
-esprima@^2.6.0:
- version "2.7.3"
- resolved "http://registry.npm.taobao.org/esprima/download/esprima-2.7.3.tgz#96e3b70d5779f6ad49cd032673d1c312767ba581"
+eslint-utils@^1.3.0, eslint-utils@^1.3.1:
+ version "1.3.1"
+ resolved "https://registry.yarnpkg.com/eslint-utils/-/eslint-utils-1.3.1.tgz#9a851ba89ee7c460346f97cf8939c7298827e512"
+ integrity sha512-Z7YjnIldX+2XMcjr7ZkgEsOj/bREONV60qYeB/bjMAqqqZ4zxKyWX+BOUkdmRmA9riiIPVvo5x86m5elviOk0Q==
+
+eslint-visitor-keys@^1.0.0:
+ version "1.0.0"
+ resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-1.0.0.tgz#3f3180fb2e291017716acb4c9d6d5b5c34a6a81d"
+ integrity sha512-qzm/XxIbxm/FHyH341ZrbnMUpe+5Bocte9xkmFMzPMjRaZMcXww+MpBptFvtU+79L362nqiLhekCxCxDPaUMBQ==
+
+eslint@^6.0.1:
+ version "6.0.1"
+ resolved "https://registry.yarnpkg.com/eslint/-/eslint-6.0.1.tgz#4a32181d72cb999d6f54151df7d337131f81cda7"
+ integrity sha512-DyQRaMmORQ+JsWShYsSg4OPTjY56u1nCjAmICrE8vLWqyLKxhFXOthwMj1SA8xwfrv0CofLNVnqbfyhwCkaO0w==
+ dependencies:
+ "@babel/code-frame" "^7.0.0"
+ ajv "^6.10.0"
+ chalk "^2.1.0"
+ cross-spawn "^6.0.5"
+ debug "^4.0.1"
+ doctrine "^3.0.0"
+ eslint-scope "^4.0.3"
+ eslint-utils "^1.3.1"
+ eslint-visitor-keys "^1.0.0"
+ espree "^6.0.0"
+ esquery "^1.0.1"
+ esutils "^2.0.2"
+ file-entry-cache "^5.0.1"
+ functional-red-black-tree "^1.0.1"
+ glob-parent "^3.1.0"
+ globals "^11.7.0"
+ ignore "^4.0.6"
+ import-fresh "^3.0.0"
+ imurmurhash "^0.1.4"
+ inquirer "^6.2.2"
+ is-glob "^4.0.0"
+ js-yaml "^3.13.1"
+ json-stable-stringify-without-jsonify "^1.0.1"
+ levn "^0.3.0"
+ lodash "^4.17.11"
+ minimatch "^3.0.4"
+ mkdirp "^0.5.1"
+ natural-compare "^1.4.0"
+ optionator "^0.8.2"
+ progress "^2.0.0"
+ regexpp "^2.0.1"
+ semver "^5.5.1"
+ strip-ansi "^4.0.0"
+ strip-json-comments "^2.0.1"
+ table "^5.2.3"
+ text-table "^0.2.0"
+
+espree@^6.0.0:
+ version "6.0.0"
+ resolved "https://registry.yarnpkg.com/espree/-/espree-6.0.0.tgz#716fc1f5a245ef5b9a7fdb1d7b0d3f02322e75f6"
+ integrity sha512-lJvCS6YbCn3ImT3yKkPe0+tJ+mH6ljhGNjHQH9mRtiO6gjhVAOhVXW1yjnwqGwTkK3bGbye+hb00nFNmu0l/1Q==
+ dependencies:
+ acorn "^6.0.7"
+ acorn-jsx "^5.0.0"
+ eslint-visitor-keys "^1.0.0"
-esprima@^3.1.3:
+esprima@^3.1.3, esprima@~3.1.0:
version "3.1.3"
- resolved "http://registry.npm.taobao.org/esprima/download/esprima-3.1.3.tgz#fdca51cee6133895e3c88d535ce49dbff62a4633"
+ resolved "https://registry.yarnpkg.com/esprima/-/esprima-3.1.3.tgz#fdca51cee6133895e3c88d535ce49dbff62a4633"
+ integrity sha1-/cpRzuYTOJXjyI1TXOSdv/YqRjM=
esprima@^4.0.0:
- version "4.0.0"
- resolved "http://registry.npm.taobao.org/esprima/download/esprima-4.0.0.tgz#4499eddcd1110e0b218bacf2fa7f7f59f55ca804"
+ version "4.0.1"
+ resolved "https://registry.yarnpkg.com/esprima/-/esprima-4.0.1.tgz#13b04cdb3e6c5d19df91ab6987a8695619b0aa71"
+ integrity sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==
+
+esquery@^1.0.1:
+ version "1.0.1"
+ resolved "https://registry.yarnpkg.com/esquery/-/esquery-1.0.1.tgz#406c51658b1f5991a5f9b62b1dc25b00e3e5c708"
+ integrity sha512-SmiyZ5zIWH9VM+SRUReLS5Q8a7GxtRdxEBVZpm98rJM7Sb+A9DVCndXfkeFUd3byderg+EbDkfnevfCwynWaNA==
+ dependencies:
+ estraverse "^4.0.0"
esrecurse@^4.1.0:
version "4.2.1"
- resolved "http://registry.npm.taobao.org/esrecurse/download/esrecurse-4.2.1.tgz#007a3b9fdbc2b3bb87e4879ea19c92fdbd3942cf"
+ resolved "https://registry.yarnpkg.com/esrecurse/-/esrecurse-4.2.1.tgz#007a3b9fdbc2b3bb87e4879ea19c92fdbd3942cf"
+ integrity sha512-64RBB++fIOAXPw3P9cy89qfMlvZEXZkqqJkjqqXIvzP5ezRZjW+lPWjw35UX/3EhUPFYbg5ER4JYgDw4007/DQ==
dependencies:
estraverse "^4.1.0"
-estraverse@^4.1.0, estraverse@^4.1.1, estraverse@^4.2.0:
+estraverse@^4.0.0, estraverse@^4.1.0, estraverse@^4.1.1, estraverse@^4.2.0:
version "4.2.0"
- resolved "http://registry.npm.taobao.org/estraverse/download/estraverse-4.2.0.tgz#0dee3fed31fcd469618ce7342099fc1afa0bdb13"
-
-esutils@^1.1.6:
- version "1.1.6"
- resolved "http://registry.npm.taobao.org/esutils/download/esutils-1.1.6.tgz#c01ccaa9ae4b897c6d0c3e210ae52f3c7a844375"
+ resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-4.2.0.tgz#0dee3fed31fcd469618ce7342099fc1afa0bdb13"
+ integrity sha1-De4/7TH81GlhjOc0IJn8GvoL2xM=
-esutils@^2.0.2:
+esutils@^2.0.0, esutils@^2.0.2:
version "2.0.2"
- resolved "http://registry.npm.taobao.org/esutils/download/esutils-2.0.2.tgz#0abf4f1caa5bcb1f7a9d8acc6dea4faaa04bac9b"
+ resolved "https://registry.yarnpkg.com/esutils/-/esutils-2.0.2.tgz#0abf4f1caa5bcb1f7a9d8acc6dea4faaa04bac9b"
+ integrity sha1-Cr9PHKpbyx96nYrMbepPqqBLrJs=
etag@~1.8.1:
version "1.8.1"
- resolved "http://registry.npm.taobao.org/etag/download/etag-1.8.1.tgz#41ae2eeb65efa62268aebfea83ac7d79299b0887"
-
-event-emitter@~0.3.5:
- version "0.3.5"
- resolved "http://registry.npm.taobao.org/event-emitter/download/event-emitter-0.3.5.tgz#df8c69eef1647923c7157b9ce83840610b02cc39"
- dependencies:
- d "1"
- es5-ext "~0.10.14"
+ resolved "https://registry.yarnpkg.com/etag/-/etag-1.8.1.tgz#41ae2eeb65efa62268aebfea83ac7d79299b0887"
+ integrity sha1-Qa4u62XvpiJorr/qg6x9eSmbCIc=
eventemitter3@^3.0.0:
- version "3.1.0"
- resolved "http://registry.npm.taobao.org/eventemitter3/download/eventemitter3-3.1.0.tgz#090b4d6cdbd645ed10bf750d4b5407942d7ba163"
-
[email protected]:
- version "0.0.1"
- resolved "http://registry.npm.taobao.org/eventlistener/download/eventlistener-0.0.1.tgz#ed2baabb852227af2bcf889152c72c63ca532eb8"
+ version "3.1.2"
+ resolved "https://registry.yarnpkg.com/eventemitter3/-/eventemitter3-3.1.2.tgz#2d3d48f9c346698fce83a85d7d664e98535df6e7"
+ integrity sha512-tvtQIeLVHjDkJYnzf2dgVMxfuSGJeM/7UCG17TT4EumTfNtF+0nebF/4zWOIkCreAbtNqhGEboB6BWrwqNaw4Q==
-events@^1.0.0:
- version "1.1.1"
- resolved "http://registry.npm.taobao.org/events/download/events-1.1.1.tgz#9ebdb7635ad099c70dcc4c2a1f5004288e8bd924"
+events@^3.0.0:
+ version "3.0.0"
+ resolved "https://registry.yarnpkg.com/events/-/events-3.0.0.tgz#9a0a0dfaf62893d92b875b8f2698ca4114973e88"
+ integrity sha512-Dc381HFWJzEOhQ+d8pkNon++bk9h6cdAoAj4iE6Q4y6xgTzySWXlKn05/TVNpjnfRqi/X0EpJEJohPjNI3zpVA==
[email protected]:
- version "0.1.6"
- resolved "http://registry.npm.taobao.org/eventsource/download/eventsource-0.1.6.tgz#0acede849ed7dd1ccc32c811bb11b944d4f29232"
+eventsource@^1.0.7:
+ version "1.0.7"
+ resolved "https://registry.yarnpkg.com/eventsource/-/eventsource-1.0.7.tgz#8fbc72c93fcd34088090bc0a4e64f4b5cee6d8d0"
+ integrity sha512-4Ln17+vVT0k8aWq+t/bF5arcS3EpT9gYtW66EPacdj/mAFevznsnyoHLPy2BA8gbIQeIHoPsvwmfBftfcG//BQ==
dependencies:
- original ">=0.0.5"
+ original "^1.0.0"
evp_bytestokey@^1.0.0, evp_bytestokey@^1.0.3:
version "1.0.3"
- resolved "http://registry.npm.taobao.org/evp_bytestokey/download/evp_bytestokey-1.0.3.tgz#7fcbdb198dc71959432efe13842684e0525acb02"
+ resolved "https://registry.yarnpkg.com/evp_bytestokey/-/evp_bytestokey-1.0.3.tgz#7fcbdb198dc71959432efe13842684e0525acb02"
+ integrity sha512-/f2Go4TognH/KvCISP7OUsHn85hT9nUkxxA9BEWxFn+Oj9o8ZNLm/40hdlgSLyuOimsrTKLUMEorQexp/aPQeA==
dependencies:
md5.js "^1.3.4"
safe-buffer "^5.1.1"
-exec-sh@^0.2.0:
- version "0.2.1"
- resolved "http://registry.npm.taobao.org/exec-sh/download/exec-sh-0.2.1.tgz#163b98a6e89e6b65b47c2a28d215bc1f63989c38"
- dependencies:
- merge "^1.1.3"
-
-execa@^0.7.0:
- version "0.7.0"
- resolved "http://registry.npm.taobao.org/execa/download/execa-0.7.0.tgz#944becd34cc41ee32a63a9faf27ad5a65fc59777"
- dependencies:
- cross-spawn "^5.0.1"
- get-stream "^3.0.0"
- is-stream "^1.1.0"
- npm-run-path "^2.0.0"
- p-finally "^1.0.0"
- signal-exit "^3.0.0"
- strip-eof "^1.0.0"
+exec-sh@^0.3.2:
+ version "0.3.2"
+ resolved "https://registry.yarnpkg.com/exec-sh/-/exec-sh-0.3.2.tgz#6738de2eb7c8e671d0366aea0b0db8c6f7d7391b"
+ integrity sha512-9sLAvzhI5nc8TpuQUh4ahMdCrWT00wPWz7j47/emR5+2qEfoZP5zzUXvx+vdx+H6ohhnsYC31iX04QLYJK8zTg==
execa@^1.0.0:
version "1.0.0"
@@ -3405,23 +3801,15 @@ execa@^1.0.0:
signal-exit "^3.0.0"
strip-eof "^1.0.0"
-exit-hook@^1.0.0:
- version "1.1.1"
- resolved "http://registry.npm.taobao.org/exit-hook/download/exit-hook-1.1.1.tgz#f05ca233b48c05d54fff07765df8507e95c02ff8"
-
exit@^0.1.2:
version "0.1.2"
- resolved "http://registry.npm.taobao.org/exit/download/exit-0.1.2.tgz#0632638f8d877cc82107d30a0fff1a17cba1cd0c"
-
-expand-brackets@^0.1.4:
- version "0.1.5"
- resolved "http://registry.npm.taobao.org/expand-brackets/download/expand-brackets-0.1.5.tgz#df07284e342a807cd733ac5af72411e581d1177b"
- dependencies:
- is-posix-bracket "^0.1.0"
+ resolved "https://registry.yarnpkg.com/exit/-/exit-0.1.2.tgz#0632638f8d877cc82107d30a0fff1a17cba1cd0c"
+ integrity sha1-BjJjj42HfMghB9MKD/8aF8uhzQw=
expand-brackets@^2.1.4:
version "2.1.4"
- resolved "http://registry.npm.taobao.org/expand-brackets/download/expand-brackets-2.1.4.tgz#b77735e315ce30f6b6eff0f83b04151a22449622"
+ resolved "https://registry.yarnpkg.com/expand-brackets/-/expand-brackets-2.1.4.tgz#b77735e315ce30f6b6eff0f83b04151a22449622"
+ integrity sha1-t3c14xXOMPa27/D4OwQVGiJEliI=
dependencies:
debug "^2.3.3"
define-property "^0.2.5"
@@ -3431,112 +3819,94 @@ expand-brackets@^2.1.4:
snapdragon "^0.8.1"
to-regex "^3.0.1"
-expand-range@^1.8.1:
- version "1.8.2"
- resolved "http://registry.npm.taobao.org/expand-range/download/expand-range-1.8.2.tgz#a299effd335fe2721ebae8e257ec79644fc85337"
- dependencies:
- fill-range "^2.1.0"
-
-expand-tilde@^1.2.2:
- version "1.2.2"
- resolved "http://registry.npm.taobao.org/expand-tilde/download/expand-tilde-1.2.2.tgz#0b81eba897e5a3d31d1c3d102f8f01441e559449"
- dependencies:
- os-homedir "^1.0.1"
-
expand-tilde@^2.0.0, expand-tilde@^2.0.2:
version "2.0.2"
- resolved "http://registry.npm.taobao.org/expand-tilde/download/expand-tilde-2.0.2.tgz#97e801aa052df02454de46b02bf621642cdc8502"
+ resolved "https://registry.yarnpkg.com/expand-tilde/-/expand-tilde-2.0.2.tgz#97e801aa052df02454de46b02bf621642cdc8502"
+ integrity sha1-l+gBqgUt8CRU3kawK/YhZCzchQI=
dependencies:
homedir-polyfill "^1.0.1"
-expect@^22.4.0:
- version "22.4.3"
- resolved "http://registry.npm.taobao.org/expect/download/expect-22.4.3.tgz#d5a29d0a0e1fb2153557caef2674d4547e914674"
+expect@^24.8.0:
+ version "24.8.0"
+ resolved "https://registry.yarnpkg.com/expect/-/expect-24.8.0.tgz#471f8ec256b7b6129ca2524b2a62f030df38718d"
+ integrity sha512-/zYvP8iMDrzaaxHVa724eJBCKqSHmO0FA7EDkBiRHxg6OipmMn1fN+C8T9L9K8yr7UONkOifu6+LLH+z76CnaA==
dependencies:
+ "@jest/types" "^24.8.0"
ansi-styles "^3.2.0"
- jest-diff "^22.4.3"
- jest-get-type "^22.4.3"
- jest-matcher-utils "^22.4.3"
- jest-message-util "^22.4.3"
- jest-regex-util "^22.4.3"
+ jest-get-type "^24.8.0"
+ jest-matcher-utils "^24.8.0"
+ jest-message-util "^24.8.0"
+ jest-regex-util "^24.3.0"
-express@^4.16.2:
- version "4.16.3"
- resolved "http://registry.npm.taobao.org/express/download/express-4.16.3.tgz#6af8a502350db3246ecc4becf6b5a34d22f7ed53"
+express@^4.17.1:
+ version "4.17.1"
+ resolved "https://registry.yarnpkg.com/express/-/express-4.17.1.tgz#4491fc38605cf51f8629d39c2b5d026f98a4c134"
+ integrity sha512-mHJ9O79RqluphRrcw2X/GTh3k9tVv8YcoyY4Kkh4WDMUYKRZUq0h1o0w2rrrxBqM7VoeUVqgb27xlEMXTnYt4g==
dependencies:
- accepts "~1.3.5"
+ accepts "~1.3.7"
array-flatten "1.1.1"
- body-parser "1.18.2"
- content-disposition "0.5.2"
+ body-parser "1.19.0"
+ content-disposition "0.5.3"
content-type "~1.0.4"
- cookie "0.3.1"
+ cookie "0.4.0"
cookie-signature "1.0.6"
debug "2.6.9"
depd "~1.1.2"
encodeurl "~1.0.2"
escape-html "~1.0.3"
etag "~1.8.1"
- finalhandler "1.1.1"
+ finalhandler "~1.1.2"
fresh "0.5.2"
merge-descriptors "1.0.1"
methods "~1.1.2"
on-finished "~2.3.0"
- parseurl "~1.3.2"
+ parseurl "~1.3.3"
path-to-regexp "0.1.7"
- proxy-addr "~2.0.3"
- qs "6.5.1"
- range-parser "~1.2.0"
- safe-buffer "5.1.1"
- send "0.16.2"
- serve-static "1.13.2"
- setprototypeof "1.1.0"
- statuses "~1.4.0"
- type-is "~1.6.16"
+ proxy-addr "~2.0.5"
+ qs "6.7.0"
+ range-parser "~1.2.1"
+ safe-buffer "5.1.2"
+ send "0.17.1"
+ serve-static "1.14.1"
+ setprototypeof "1.1.1"
+ statuses "~1.5.0"
+ type-is "~1.6.18"
utils-merge "1.0.1"
vary "~1.1.2"
extend-shallow@^2.0.1:
version "2.0.1"
- resolved "http://registry.npm.taobao.org/extend-shallow/download/extend-shallow-2.0.1.tgz#51af7d614ad9a9f610ea1bafbb989d6b1c56890f"
+ resolved "https://registry.yarnpkg.com/extend-shallow/-/extend-shallow-2.0.1.tgz#51af7d614ad9a9f610ea1bafbb989d6b1c56890f"
+ integrity sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=
dependencies:
is-extendable "^0.1.0"
extend-shallow@^3.0.0, extend-shallow@^3.0.2:
version "3.0.2"
- resolved "http://registry.npm.taobao.org/extend-shallow/download/extend-shallow-3.0.2.tgz#26a71aaf073b39fb2127172746131c2704028db8"
+ resolved "https://registry.yarnpkg.com/extend-shallow/-/extend-shallow-3.0.2.tgz#26a71aaf073b39fb2127172746131c2704028db8"
+ integrity sha1-Jqcarwc7OfshJxcnRhMcJwQCjbg=
dependencies:
assign-symbols "^1.0.0"
is-extendable "^1.0.1"
-extend@^3.0.0, extend@~3.0.0, extend@~3.0.1:
- version "3.0.1"
- resolved "http://registry.npm.taobao.org/extend/download/extend-3.0.1.tgz#a755ea7bc1adfcc5a31ce7e762dbaadc5e636444"
-
-external-editor@^1.1.0:
- version "1.1.1"
- resolved "http://registry.npm.taobao.org/external-editor/download/external-editor-1.1.1.tgz#12d7b0db850f7ff7e7081baf4005700060c4600b"
- dependencies:
- extend "^3.0.0"
- spawn-sync "^1.0.15"
- tmp "^0.0.29"
+extend@~3.0.2:
+ version "3.0.2"
+ resolved "https://registry.yarnpkg.com/extend/-/extend-3.0.2.tgz#f8b1136b4071fbd8eb140aff858b1019ec2915fa"
+ integrity sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g==
-external-editor@^2.0.1, external-editor@^2.0.4:
- version "2.2.0"
- resolved "http://registry.npm.taobao.org/external-editor/download/external-editor-2.2.0.tgz#045511cfd8d133f3846673d1047c154e214ad3d5"
+external-editor@^3.0.0, external-editor@^3.0.3:
+ version "3.0.3"
+ resolved "https://registry.yarnpkg.com/external-editor/-/external-editor-3.0.3.tgz#5866db29a97826dbe4bf3afd24070ead9ea43a27"
+ integrity sha512-bn71H9+qWoOQKyZDo25mOMVpSmXROAsTJVVVYzrrtol3d4y+AsKjf4Iwl2Q+IuT0kFSQ1qo166UuIwqYq7mGnA==
dependencies:
- chardet "^0.4.0"
- iconv-lite "^0.4.17"
+ chardet "^0.7.0"
+ iconv-lite "^0.4.24"
tmp "^0.0.33"
-extglob@^0.3.1:
- version "0.3.2"
- resolved "http://registry.npm.taobao.org/extglob/download/extglob-0.3.2.tgz#2e18ff3d2f49ab2765cec9023f011daa8d8349a1"
- dependencies:
- is-extglob "^1.0.0"
-
extglob@^2.0.4:
version "2.0.4"
- resolved "http://registry.npm.taobao.org/extglob/download/extglob-2.0.4.tgz#ad00fe4dc612a9232e8718711dc5cb5ab0285543"
+ resolved "https://registry.yarnpkg.com/extglob/-/extglob-2.0.4.tgz#ad00fe4dc612a9232e8718711dc5cb5ab0285543"
+ integrity sha512-Nmb6QXkELsuBr24CJSkilo6UHHgbekK5UiZgfE6UHD3Eb27YC6oD+bhcT+tJ6cl8dmsgdQxnWlcry8ksBIBLpw==
dependencies:
array-unique "^0.3.2"
define-property "^1.0.0"
@@ -3547,368 +3917,330 @@ extglob@^2.0.4:
snapdragon "^0.8.1"
to-regex "^3.0.1"
[email protected]:
- version "3.0.2"
- resolved "http://registry.npm.taobao.org/extract-text-webpack-plugin/download/extract-text-webpack-plugin-3.0.2.tgz#5f043eaa02f9750a9258b78c0a6e0dc1408fb2f7"
- dependencies:
- async "^2.4.1"
- loader-utils "^1.1.0"
- schema-utils "^0.3.0"
- webpack-sources "^1.0.1"
-
[email protected]:
version "1.3.0"
- resolved "http://registry.npm.taobao.org/extsprintf/download/extsprintf-1.3.0.tgz#96918440e3041a7a414f8c52e3c574eb3c3e1e05"
+ resolved "https://registry.yarnpkg.com/extsprintf/-/extsprintf-1.3.0.tgz#96918440e3041a7a414f8c52e3c574eb3c3e1e05"
+ integrity sha1-lpGEQOMEGnpBT4xS48V06zw+HgU=
extsprintf@^1.2.0:
version "1.4.0"
- resolved "http://registry.npm.taobao.org/extsprintf/download/extsprintf-1.4.0.tgz#e2689f8f356fad62cca65a3a91c5df5f9551692f"
-
-fast-deep-equal@^1.0.0:
- version "1.1.0"
- resolved "http://registry.npm.taobao.org/fast-deep-equal/download/fast-deep-equal-1.1.0.tgz#c053477817c86b51daa853c81e059b733d023614"
+ resolved "https://registry.yarnpkg.com/extsprintf/-/extsprintf-1.4.0.tgz#e2689f8f356fad62cca65a3a91c5df5f9551692f"
+ integrity sha1-4mifjzVvrWLMplo6kcXfX5VRaS8=
fast-deep-equal@^2.0.1:
version "2.0.1"
- resolved "http://registry.npm.taobao.org/fast-deep-equal/download/fast-deep-equal-2.0.1.tgz#7b05218ddf9667bf7f370bf7fdb2cb15fdd0aa49"
+ resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-2.0.1.tgz#7b05218ddf9667bf7f370bf7fdb2cb15fdd0aa49"
+ integrity sha1-ewUhjd+WZ79/Nwv3/bLLFf3Qqkk=
+
+fast-diff@^1.1.2:
+ version "1.2.0"
+ resolved "https://registry.yarnpkg.com/fast-diff/-/fast-diff-1.2.0.tgz#73ee11982d86caaf7959828d519cfe927fac5f03"
+ integrity sha512-xJuoT5+L99XlZ8twedaRf6Ax2TgQVxvgZOYoPKqZufmJib0tL2tegPBOZb1pVNgIhlqDlA0eO0c3wBvQcmzx4w==
+
+fast-glob@^3.0.3:
+ version "3.0.3"
+ resolved "https://registry.yarnpkg.com/fast-glob/-/fast-glob-3.0.3.tgz#084221f4225d51553bccd5ff4afc17aafa869412"
+ integrity sha512-scDJbDhN+6S4ELXzzN96Fqm5y1CMRn+Io3C4Go+n/gUKP+LW26Wma6IxLSsX2eAMBUOFmyHKDBrUSuoHsycQ5A==
+ dependencies:
+ "@nodelib/fs.stat" "^2.0.1"
+ "@nodelib/fs.walk" "^1.2.1"
+ glob-parent "^5.0.0"
+ is-glob "^4.0.1"
+ merge2 "^1.2.3"
+ micromatch "^4.0.2"
fast-json-stable-stringify@^2.0.0:
version "2.0.0"
- resolved "http://registry.npm.taobao.org/fast-json-stable-stringify/download/fast-json-stable-stringify-2.0.0.tgz#d5142c0caee6b1189f87d3a76111064f86c8bbf2"
+ resolved "https://registry.yarnpkg.com/fast-json-stable-stringify/-/fast-json-stable-stringify-2.0.0.tgz#d5142c0caee6b1189f87d3a76111064f86c8bbf2"
+ integrity sha1-1RQsDK7msRifh9OnYREGT4bIu/I=
-fast-levenshtein@~2.0.4:
+fast-levenshtein@^2.0.6, fast-levenshtein@~2.0.4:
version "2.0.6"
- resolved "http://registry.npm.taobao.org/fast-levenshtein/download/fast-levenshtein-2.0.6.tgz#3d8a5c66883a16a30ca8643e851f19baa7797917"
+ resolved "https://registry.yarnpkg.com/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz#3d8a5c66883a16a30ca8643e851f19baa7797917"
+ integrity sha1-PYpcZog6FqMMqGQ+hR8Zuqd5eRc=
fastparse@^1.1.1:
- version "1.1.1"
- resolved "http://registry.npm.taobao.org/fastparse/download/fastparse-1.1.1.tgz#d1e2643b38a94d7583b479060e6c4affc94071f8"
+ version "1.1.2"
+ resolved "https://registry.yarnpkg.com/fastparse/-/fastparse-1.1.2.tgz#91728c5a5942eced8531283c79441ee4122c35a9"
+ integrity sha512-483XLLxTVIwWK3QTrMGRqUfUpoOs/0hbQrl2oz4J0pAcm3A3bu84wxTFqGqkJzewCLdME38xJLJAxBABfQT8sQ==
+
+fastq@^1.6.0:
+ version "1.6.0"
+ resolved "https://registry.yarnpkg.com/fastq/-/fastq-1.6.0.tgz#4ec8a38f4ac25f21492673adb7eae9cfef47d1c2"
+ integrity sha512-jmxqQ3Z/nXoeyDmWAzF9kH1aGZSis6e/SbfPmJpUnyZ0ogr6iscHQaml4wsEepEWSdtmpy+eVXmCRIMpxaXqOA==
+ dependencies:
+ reusify "^1.0.0"
faye-websocket@^0.10.0:
version "0.10.0"
- resolved "http://registry.npm.taobao.org/faye-websocket/download/faye-websocket-0.10.0.tgz#4e492f8d04dfb6f89003507f6edbf2d501e7c6f4"
+ resolved "https://registry.yarnpkg.com/faye-websocket/-/faye-websocket-0.10.0.tgz#4e492f8d04dfb6f89003507f6edbf2d501e7c6f4"
+ integrity sha1-TkkvjQTftviQA1B/btvy1QHnxvQ=
dependencies:
websocket-driver ">=0.5.1"
-faye-websocket@~0.11.0:
- version "0.11.1"
- resolved "http://registry.npm.taobao.org/faye-websocket/download/faye-websocket-0.11.1.tgz#f0efe18c4f56e4f40afc7e06c719fd5ee6188f38"
+faye-websocket@~0.11.1:
+ version "0.11.3"
+ resolved "https://registry.yarnpkg.com/faye-websocket/-/faye-websocket-0.11.3.tgz#5c0e9a8968e8912c286639fde977a8b209f2508e"
+ integrity sha512-D2y4bovYpzziGgbHYtGCMjlJM36vAl/y+xUyn1C+FVx8szd1E+86KwVw6XvYSzOP8iMpm1X0I4xJD+QtUb36OA==
dependencies:
websocket-driver ">=0.5.1"
fb-watchman@^2.0.0:
version "2.0.0"
- resolved "http://registry.npm.taobao.org/fb-watchman/download/fb-watchman-2.0.0.tgz#54e9abf7dfa2f26cd9b1636c588c1afc05de5d58"
+ resolved "https://registry.yarnpkg.com/fb-watchman/-/fb-watchman-2.0.0.tgz#54e9abf7dfa2f26cd9b1636c588c1afc05de5d58"
+ integrity sha1-VOmr99+i8mzZsWNsWIwa/AXeXVg=
dependencies:
bser "^2.0.0"
-fbjs@^0.8.0:
- version "0.8.17"
- resolved "http://registry.npm.taobao.org/fbjs/download/fbjs-0.8.17.tgz#c4d598ead6949112653d6588b01a5cdcd9f90fdd"
- integrity sha1-xNWY6taUkRJlPWWIsBpc3Nn5D90=
- dependencies:
- core-js "^1.0.0"
- isomorphic-fetch "^2.1.1"
- loose-envify "^1.0.0"
- object-assign "^4.1.0"
- promise "^7.1.1"
- setimmediate "^1.0.5"
- ua-parser-js "^0.7.18"
-
-fbjs@^0.8.15, fbjs@^0.8.16, fbjs@^0.8.9:
- version "0.8.16"
- resolved "http://registry.npm.taobao.org/fbjs/download/fbjs-0.8.16.tgz#5e67432f550dc41b572bf55847b8aca64e5337db"
- dependencies:
- core-js "^1.0.0"
- isomorphic-fetch "^2.1.1"
- loose-envify "^1.0.0"
- object-assign "^4.1.0"
- promise "^7.1.1"
- setimmediate "^1.0.5"
- ua-parser-js "^0.7.9"
+figgy-pudding@^3.5.1:
+ version "3.5.1"
+ resolved "https://registry.yarnpkg.com/figgy-pudding/-/figgy-pudding-3.5.1.tgz#862470112901c727a0e495a80744bd5baa1d6790"
+ integrity sha512-vNKxJHTEKNThjfrdJwHc7brvM6eVevuO5nTj6ez8ZQ1qbXTvGthucRF7S4vf2cr71QVnT70V34v0S1DyQsti0w==
-figures@^1.3.5, figures@^1.5.0:
- version "1.7.0"
- resolved "http://registry.npm.taobao.org/figures/download/figures-1.7.0.tgz#cbe1e3affcf1cd44b80cadfed28dc793a9701d2e"
[email protected]:
+ version "3.0.0"
+ resolved "https://registry.yarnpkg.com/figures/-/figures-3.0.0.tgz#756275c964646163cc6f9197c7a0295dbfd04de9"
+ integrity sha512-HKri+WoWoUgr83pehn/SIgLOMZ9nAWC6dcGj26RY2R4F50u4+RTUz0RCrUlOV3nKRAICW1UGzyb+kcX2qK1S/g==
dependencies:
escape-string-regexp "^1.0.5"
- object-assign "^4.1.0"
figures@^2.0.0:
version "2.0.0"
- resolved "http://registry.npm.taobao.org/figures/download/figures-2.0.0.tgz#3ab1a2d2a62c8bfb431a0c94cb797a2fce27c962"
+ resolved "https://registry.yarnpkg.com/figures/-/figures-2.0.0.tgz#3ab1a2d2a62c8bfb431a0c94cb797a2fce27c962"
+ integrity sha1-OrGi0qYsi/tDGgyUy3l6L84nyWI=
dependencies:
escape-string-regexp "^1.0.5"
[email protected]:
- version "1.1.11"
- resolved "http://registry.npm.taobao.org/file-loader/download/file-loader-1.1.11.tgz#6fe886449b0f2a936e43cabaac0cdbfb369506f8"
- dependencies:
- loader-utils "^1.0.2"
- schema-utils "^0.4.5"
-
-filename-regex@^2.0.0:
- version "2.0.1"
- resolved "http://registry.npm.taobao.org/filename-regex/download/filename-regex-2.0.1.tgz#c1c4b9bee3e09725ddb106b75c1e301fe2f18b26"
-
-fileset@^2.0.2:
- version "2.0.3"
- resolved "http://registry.npm.taobao.org/fileset/download/fileset-2.0.3.tgz#8e7548a96d3cc2327ee5e674168723a333bba2a0"
+file-entry-cache@^5.0.1:
+ version "5.0.1"
+ resolved "https://registry.yarnpkg.com/file-entry-cache/-/file-entry-cache-5.0.1.tgz#ca0f6efa6dd3d561333fb14515065c2fafdf439c"
+ integrity sha512-bCg29ictuBaKUwwArK4ouCaqDgLZcysCFLmM/Yn/FDoqndh/9vNuQfXRDvTuXKLxfD/JtZQGKFT8MGcJBK644g==
dependencies:
- glob "^7.0.3"
- minimatch "^3.0.3"
+ flat-cache "^2.0.1"
[email protected]:
- version "3.5.11"
- resolved "http://registry.npm.taobao.org/filesize/download/filesize-3.5.11.tgz#1919326749433bb3cf77368bd158caabcc19e9ee"
-
-filesize@^3.5.11:
- version "3.6.1"
- resolved "http://registry.npm.taobao.org/filesize/download/filesize-3.6.1.tgz#090bb3ee01b6f801a8a8be99d31710b3422bb317"
-
-fill-range@^2.1.0:
- version "2.2.4"
- resolved "http://registry.npm.taobao.org/fill-range/download/fill-range-2.2.4.tgz#eb1e773abb056dcd8df2bfdf6af59b8b3a936565"
+file-loader@^3.0.1:
+ version "3.0.1"
+ resolved "https://registry.yarnpkg.com/file-loader/-/file-loader-3.0.1.tgz#f8e0ba0b599918b51adfe45d66d1e771ad560faa"
+ integrity sha512-4sNIOXgtH/9WZq4NvlfU3Opn5ynUsqBwSLyM+I7UOwdGigTBYfVVQEwe/msZNX/j4pCJTIM14Fsw66Svo1oVrw==
dependencies:
- is-number "^2.1.0"
- isobject "^2.0.0"
- randomatic "^3.0.0"
- repeat-element "^1.1.2"
- repeat-string "^1.5.2"
+ loader-utils "^1.0.2"
+ schema-utils "^1.0.0"
fill-range@^4.0.0:
version "4.0.0"
- resolved "http://registry.npm.taobao.org/fill-range/download/fill-range-4.0.0.tgz#d544811d428f98eb06a63dc402d2403c328c38f7"
+ resolved "https://registry.yarnpkg.com/fill-range/-/fill-range-4.0.0.tgz#d544811d428f98eb06a63dc402d2403c328c38f7"
+ integrity sha1-1USBHUKPmOsGpj3EAtJAPDKMOPc=
dependencies:
extend-shallow "^2.0.1"
is-number "^3.0.0"
repeat-string "^1.6.1"
to-regex-range "^2.1.0"
[email protected]:
- version "1.1.1"
- resolved "http://registry.npm.taobao.org/finalhandler/download/finalhandler-1.1.1.tgz#eebf4ed840079c83f4249038c9d703008301b105"
+fill-range@^7.0.1:
+ version "7.0.1"
+ resolved "https://registry.yarnpkg.com/fill-range/-/fill-range-7.0.1.tgz#1919a6a7c75fe38b2c7c77e5198535da9acdda40"
+ integrity sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==
+ dependencies:
+ to-regex-range "^5.0.1"
+
+finalhandler@~1.1.2:
+ version "1.1.2"
+ resolved "https://registry.yarnpkg.com/finalhandler/-/finalhandler-1.1.2.tgz#b7e7d000ffd11938d0fdb053506f6ebabe9f587d"
+ integrity sha512-aAWcW57uxVNrQZqFXjITpW3sIUQmHGG3qSb9mUah9MgMC4NeWhNOlNjXEYq3HjRAvL6arUviZGGJsBg6z0zsWA==
dependencies:
debug "2.6.9"
encodeurl "~1.0.2"
escape-html "~1.0.3"
on-finished "~2.3.0"
- parseurl "~1.3.2"
- statuses "~1.4.0"
+ parseurl "~1.3.3"
+ statuses "~1.5.0"
unpipe "~1.0.0"
find-cache-dir@^1.0.0:
version "1.0.0"
- resolved "http://registry.npm.taobao.org/find-cache-dir/download/find-cache-dir-1.0.0.tgz#9288e3e9e3cc3748717d39eade17cf71fc30ee6f"
+ resolved "https://registry.yarnpkg.com/find-cache-dir/-/find-cache-dir-1.0.0.tgz#9288e3e9e3cc3748717d39eade17cf71fc30ee6f"
+ integrity sha1-kojj6ePMN0hxfTnq3hfPcfww7m8=
dependencies:
commondir "^1.0.1"
make-dir "^1.0.0"
pkg-dir "^2.0.0"
-find-index@^0.1.1:
- version "0.1.1"
- resolved "http://registry.npm.taobao.org/find-index/download/find-index-0.1.1.tgz#675d358b2ca3892d795a1ab47232f8b6e2e0dde4"
+find-cache-dir@^2.0.0:
+ version "2.1.0"
+ resolved "https://registry.yarnpkg.com/find-cache-dir/-/find-cache-dir-2.1.0.tgz#8d0f94cd13fe43c6c7c261a0d86115ca918c05f7"
+ integrity sha512-Tq6PixE0w/VMFfCgbONnkiQIVol/JJL7nRMi20fqzA4NRs9AfeqMGeRdPi3wIhYkxjeBaWh2rxwapn5Tu3IqOQ==
+ dependencies:
+ commondir "^1.0.1"
+ make-dir "^2.0.0"
+ pkg-dir "^3.0.0"
[email protected]:
- version "1.0.4"
- resolved "http://registry.npm.taobao.org/find-node-modules/download/find-node-modules-1.0.4.tgz#b6deb3cccb699c87037677bcede2c5f5862b2550"
[email protected]:
+ version "2.0.0"
+ resolved "https://registry.yarnpkg.com/find-node-modules/-/find-node-modules-2.0.0.tgz#5db1fb9e668a3d451db3d618cd167cdd59e41b69"
+ integrity sha512-8MWIBRgJi/WpjjfVXumjPKCtmQ10B+fjx6zmSA+770GMJirLhWIzg8l763rhjl9xaeaHbnxPNRQKq2mgMhr+aw==
dependencies:
- findup-sync "0.4.2"
- merge "^1.2.0"
+ findup-sync "^3.0.0"
+ merge "^1.2.1"
[email protected]:
- version "1.0.0"
- resolved "http://registry.npm.taobao.org/find-root/download/find-root-1.0.0.tgz#962ff211aab25c6520feeeb8d6287f8f6e95807a"
[email protected]:
+ version "1.1.0"
+ resolved "https://registry.yarnpkg.com/find-root/-/find-root-1.1.0.tgz#abcfc8ba76f708c42a97b3d685b7e9450bfb9ce4"
+ integrity sha512-NKfW6bec6GfKc0SGx1e07QZY9PE99u0Bft/0rzSD5k3sO/vwkVUpDUKVm5Gpp5Ue3YfShPFTX2070tDs5kB9Ng==
+
[email protected], find-up@^3.0.0:
+ version "3.0.0"
+ resolved "https://registry.yarnpkg.com/find-up/-/find-up-3.0.0.tgz#49169f1d7993430646da61ecc5ae355c21c97b73"
+ integrity sha512-1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg==
+ dependencies:
+ locate-path "^3.0.0"
find-up@^1.0.0:
version "1.1.2"
- resolved "http://registry.npm.taobao.org/find-up/download/find-up-1.1.2.tgz#6b2e9822b1a2ce0a60ab64d610eccad53cb24d0f"
+ resolved "https://registry.yarnpkg.com/find-up/-/find-up-1.1.2.tgz#6b2e9822b1a2ce0a60ab64d610eccad53cb24d0f"
+ integrity sha1-ay6YIrGizgpgq2TWEOzK1TyyTQ8=
dependencies:
path-exists "^2.0.0"
pinkie-promise "^2.0.0"
find-up@^2.0.0, find-up@^2.1.0:
version "2.1.0"
- resolved "http://registry.npm.taobao.org/find-up/download/find-up-2.1.0.tgz#45d1b7e506c717ddd482775a2b77920a3c0c57a7"
+ resolved "https://registry.yarnpkg.com/find-up/-/find-up-2.1.0.tgz#45d1b7e506c717ddd482775a2b77920a3c0c57a7"
+ integrity sha1-RdG35QbHF93UgndaK3eSCjwMV6c=
dependencies:
locate-path "^2.0.0"
-find-up@^3.0.0:
- version "3.0.0"
- resolved "https://registry.yarnpkg.com/find-up/-/find-up-3.0.0.tgz#49169f1d7993430646da61ecc5ae355c21c97b73"
- integrity sha512-1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg==
+find-up@^4.0.0:
+ version "4.1.0"
+ resolved "https://registry.yarnpkg.com/find-up/-/find-up-4.1.0.tgz#97afe7d6cdc0bc5928584b7c8d7b16e8a9aa5d19"
+ integrity sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==
dependencies:
- locate-path "^3.0.0"
+ locate-path "^5.0.0"
+ path-exists "^4.0.0"
[email protected]:
- version "0.4.2"
- resolved "http://registry.npm.taobao.org/findup-sync/download/findup-sync-0.4.2.tgz#a8117d0f73124f5a4546839579fe52d7129fb5e5"
[email protected], findup-sync@^3.0.0:
+ version "3.0.0"
+ resolved "https://registry.yarnpkg.com/findup-sync/-/findup-sync-3.0.0.tgz#17b108f9ee512dfb7a5c7f3c8b27ea9e1a9c08d1"
+ integrity sha512-YbffarhcicEhOrm4CtrwdKBdCuz576RLdhJDsIfvNtxUuhdRet1qZcsMjqbePtAseKdAnDyM/IyXbu7PRPRLYg==
dependencies:
- detect-file "^0.1.0"
- is-glob "^2.0.1"
- micromatch "^2.3.7"
- resolve-dir "^0.1.0"
+ detect-file "^1.0.0"
+ is-glob "^4.0.0"
+ micromatch "^3.0.4"
+ resolve-dir "^1.0.1"
-findup-sync@~0.3.0:
- version "0.3.0"
- resolved "http://registry.npm.taobao.org/findup-sync/download/findup-sync-0.3.0.tgz#37930aa5d816b777c03445e1966cc6790a4c0b16"
+flat-cache@^2.0.1:
+ version "2.0.1"
+ resolved "https://registry.yarnpkg.com/flat-cache/-/flat-cache-2.0.1.tgz#5d296d6f04bda44a4630a301413bdbc2ec085ec0"
+ integrity sha512-LoQe6yDuUMDzQAEH8sgmh4Md6oZnc/7PjtwjNFSzveXqSHt6ka9fPBuso7IGf9Rz4uqnSnWiFH2B/zj24a5ReA==
dependencies:
- glob "~5.0.0"
+ flatted "^2.0.0"
+ rimraf "2.6.3"
+ write "1.0.3"
-flatten@^1.0.2:
- version "1.0.2"
- resolved "http://registry.npm.taobao.org/flatten/download/flatten-1.0.2.tgz#dae46a9d78fbe25292258cc1e780a41d95c03782"
+flatted@^2.0.0:
+ version "2.0.1"
+ resolved "https://registry.yarnpkg.com/flatted/-/flatted-2.0.1.tgz#69e57caa8f0eacbc281d2e2cb458d46fdb449e08"
+ integrity sha512-a1hQMktqW9Nmqr5aktAux3JMNqaucxGcjtjWnZLHX7yyPCmlSV3M54nGYbqT8K+0GhF3NBgmJCc3ma+WOgX8Jg==
flush-write-stream@^1.0.0:
- version "1.0.3"
- resolved "http://registry.npm.taobao.org/flush-write-stream/download/flush-write-stream-1.0.3.tgz#c5d586ef38af6097650b49bc41b55fabb19f35bd"
+ version "1.1.1"
+ resolved "https://registry.yarnpkg.com/flush-write-stream/-/flush-write-stream-1.1.1.tgz#8dd7d873a1babc207d94ead0c2e0e44276ebf2e8"
+ integrity sha512-3Z4XhFZ3992uIq0XOqb9AreonueSYphE6oYbpt5+3u06JWklbsPkNv3ZKkP9Bz/r+1MWCaMoSQ28P85+1Yc77w==
dependencies:
- inherits "^2.0.1"
- readable-stream "^2.0.4"
+ inherits "^2.0.3"
+ readable-stream "^2.3.6"
follow-redirects@^1.0.0:
- version "1.5.0"
- resolved "http://registry.npm.taobao.org/follow-redirects/download/follow-redirects-1.5.0.tgz#234f49cf770b7f35b40e790f636ceba0c3a0ab77"
+ version "1.7.0"
+ resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.7.0.tgz#489ebc198dc0e7f64167bd23b03c4c19b5784c76"
+ integrity sha512-m/pZQy4Gj287eNy94nivy5wchN3Kp+Q5WgUPNy5lJSZ3sgkVKSYV/ZChMAQVIgx1SqfZ2zBZtPA2YlXIWxxJOQ==
dependencies:
- debug "^3.1.0"
-
-for-in@^0.1.3:
- version "0.1.8"
- resolved "http://registry.npm.taobao.org/for-in/download/for-in-0.1.8.tgz#d8773908e31256109952b1fdb9b3fa867d2775e1"
+ debug "^3.2.6"
-for-in@^1.0.1, for-in@^1.0.2:
+for-in@^1.0.2:
version "1.0.2"
- resolved "http://registry.npm.taobao.org/for-in/download/for-in-1.0.2.tgz#81068d295a8142ec0ac726c6e2200c30fb6d5e80"
-
-for-own@^0.1.4:
- version "0.1.5"
- resolved "http://registry.npm.taobao.org/for-own/download/for-own-0.1.5.tgz#5265c681a4f294dabbf17c9509b6763aa84510ce"
- dependencies:
- for-in "^1.0.1"
-
-for-own@^1.0.0:
- version "1.0.0"
- resolved "http://registry.npm.taobao.org/for-own/download/for-own-1.0.0.tgz#c63332f415cedc4b04dbfe70cf836494c53cb44b"
- dependencies:
- for-in "^1.0.1"
-
-foreach@^2.0.5:
- version "2.0.5"
- resolved "http://registry.npm.taobao.org/foreach/download/foreach-2.0.5.tgz#0bee005018aeb260d0a3af3ae658dd0136ec1b99"
+ resolved "https://registry.yarnpkg.com/for-in/-/for-in-1.0.2.tgz#81068d295a8142ec0ac726c6e2200c30fb6d5e80"
+ integrity sha1-gQaNKVqBQuwKxybG4iAMMPttXoA=
forever-agent@~0.6.1:
version "0.6.1"
- resolved "http://registry.npm.taobao.org/forever-agent/download/forever-agent-0.6.1.tgz#fbc71f0c41adeb37f96c577ad1ed42d8fdacca91"
-
-fork-ts-checker-webpack-plugin@^0.4.0:
- version "0.4.1"
- resolved "http://registry.npm.taobao.org/fork-ts-checker-webpack-plugin/download/fork-ts-checker-webpack-plugin-0.4.1.tgz#718801621c50c7f20de9c8e6a68a2db228a4081f"
- dependencies:
- babel-code-frame "^6.22.0"
- chalk "^1.1.3"
- chokidar "^1.7.0"
- lodash.endswith "^4.2.1"
- lodash.isfunction "^3.0.8"
- lodash.isstring "^4.0.1"
- lodash.startswith "^4.2.1"
- minimatch "^3.0.4"
- resolve "^1.5.0"
- tapable "^1.0.0"
- vue-parser "^1.1.5"
+ resolved "https://registry.yarnpkg.com/forever-agent/-/forever-agent-0.6.1.tgz#fbc71f0c41adeb37f96c577ad1ed42d8fdacca91"
+ integrity sha1-+8cfDEGt6zf5bFd60e1C2P2sypE=
-form-data@^2.3.3:
+form-data@~2.3.2:
version "2.3.3"
- resolved "http://registry.npm.taobao.org/form-data/download/form-data-2.3.3.tgz#dcce52c05f644f298c6a7ab936bd724ceffbf3a6"
- integrity sha1-3M5SwF9kTymManq5Nr1yTO/786Y=
+ resolved "https://registry.yarnpkg.com/form-data/-/form-data-2.3.3.tgz#dcce52c05f644f298c6a7ab936bd724ceffbf3a6"
+ integrity sha512-1lLKB2Mu3aGP1Q/2eCOx0fNbRMe7XdwktwOruhfqqd0rIJWwN4Dh+E3hrPSlDCXnSR7UtZ1N38rVXm+6+MEhJQ==
dependencies:
asynckit "^0.4.0"
combined-stream "^1.0.6"
mime-types "^2.1.12"
-form-data@~2.1.1:
- version "2.1.4"
- resolved "http://registry.npm.taobao.org/form-data/download/form-data-2.1.4.tgz#33c183acf193276ecaa98143a69e94bfee1750d1"
- dependencies:
- asynckit "^0.4.0"
- combined-stream "^1.0.5"
- mime-types "^2.1.12"
-
-form-data@~2.3.1:
- version "2.3.2"
- resolved "http://registry.npm.taobao.org/form-data/download/form-data-2.3.2.tgz#4970498be604c20c005d4f5c23aecd21d6b49099"
- dependencies:
- asynckit "^0.4.0"
- combined-stream "1.0.6"
- mime-types "^2.1.12"
-
forwarded@~0.1.2:
version "0.1.2"
- resolved "http://registry.npm.taobao.org/forwarded/download/forwarded-0.1.2.tgz#98c23dab1175657b8c0573e8ceccd91b0ff18c84"
+ resolved "https://registry.yarnpkg.com/forwarded/-/forwarded-0.1.2.tgz#98c23dab1175657b8c0573e8ceccd91b0ff18c84"
+ integrity sha1-mMI9qxF1ZXuMBXPozszZGw/xjIQ=
fragment-cache@^0.2.1:
version "0.2.1"
- resolved "http://registry.npm.taobao.org/fragment-cache/download/fragment-cache-0.2.1.tgz#4290fad27f13e89be7f33799c6bc5a0abfff0d19"
+ resolved "https://registry.yarnpkg.com/fragment-cache/-/fragment-cache-0.2.1.tgz#4290fad27f13e89be7f33799c6bc5a0abfff0d19"
+ integrity sha1-QpD60n8T6Jvn8zeZxrxaCr//DRk=
dependencies:
map-cache "^0.2.2"
[email protected]:
version "0.5.2"
- resolved "http://registry.npm.taobao.org/fresh/download/fresh-0.5.2.tgz#3d8cadd90d976569fa835ab1f8e4b23a105605a7"
+ resolved "https://registry.yarnpkg.com/fresh/-/fresh-0.5.2.tgz#3d8cadd90d976569fa835ab1f8e4b23a105605a7"
+ integrity sha1-PYyt2Q2XZWn6g1qx+OSyOhBWBac=
from2@^2.1.0:
version "2.3.0"
- resolved "http://registry.npm.taobao.org/from2/download/from2-2.3.0.tgz#8bfb5502bde4a4d36cfdeea007fcca21d7e382af"
+ resolved "https://registry.yarnpkg.com/from2/-/from2-2.3.0.tgz#8bfb5502bde4a4d36cfdeea007fcca21d7e382af"
+ integrity sha1-i/tVAr3kpNNs/e6gB/zKIdfjgq8=
dependencies:
inherits "^2.0.1"
readable-stream "^2.0.0"
-fs-access@^1.0.0:
[email protected]:
version "1.0.1"
- resolved "http://registry.npm.taobao.org/fs-access/download/fs-access-1.0.1.tgz#d6a87f262271cefebec30c553407fb995da8777a"
+ resolved "https://registry.yarnpkg.com/fs-access/-/fs-access-1.0.1.tgz#d6a87f262271cefebec30c553407fb995da8777a"
+ integrity sha1-1qh/JiJxzv6+wwxVNAf7mV2od3o=
dependencies:
null-check "^1.0.0"
fs-constants@^1.0.0:
version "1.0.0"
- resolved "http://registry.npm.taobao.org/fs-constants/download/fs-constants-1.0.0.tgz#6be0de9be998ce16af8afc24497b9ee9b7ccd9ad"
-
-fs-exists-sync@^0.1.0:
- version "0.1.0"
- resolved "http://registry.npm.taobao.org/fs-exists-sync/download/fs-exists-sync-0.1.0.tgz#982d6893af918e72d08dec9e8673ff2b5a8d6add"
+ resolved "https://registry.yarnpkg.com/fs-constants/-/fs-constants-1.0.0.tgz#6be0de9be998ce16af8afc24497b9ee9b7ccd9ad"
+ integrity sha512-y6OAwoSIf7FyjMIv94u+b5rdheZEjzR63GTyZJm5qh4Bi+2YgwLCcI/fPFZkL5PSixOt6ZNKm+w+Hfp/Bciwow==
[email protected]:
- version "6.0.0"
- resolved "http://registry.npm.taobao.org/fs-extra/download/fs-extra-6.0.0.tgz#0f0afb290bb3deb87978da816fcd3c7797f3a817"
+fs-extra@^7.0.0:
+ version "7.0.1"
+ resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-7.0.1.tgz#4f189c44aa123b895f722804f55ea23eadc348e9"
+ integrity sha512-YJDaCJZEnBmcbw13fvdAM9AwNOJwOzrE4pqMqBq5nFiEqXUqHwlK4B+3pUw6JNvfSPtX05xFHtYy/1ni01eGCw==
dependencies:
graceful-fs "^4.1.2"
jsonfile "^4.0.0"
universalify "^0.1.0"
-fs-extra@^1.0.0:
- version "1.0.0"
- resolved "http://registry.npm.taobao.org/fs-extra/download/fs-extra-1.0.0.tgz#cd3ce5f7e7cb6145883fcae3191e9877f8587950"
- dependencies:
- graceful-fs "^4.1.2"
- jsonfile "^2.1.0"
- klaw "^1.0.0"
-
-fs-extra@^5.0.0:
- version "5.0.0"
- resolved "http://registry.npm.taobao.org/fs-extra/download/fs-extra-5.0.0.tgz#414d0110cdd06705734d055652c5411260c31abd"
+fs-extra@^8.0.1:
+ version "8.1.0"
+ resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-8.1.0.tgz#49d43c45a88cd9677668cb7be1b46efdb8d2e1c0"
+ integrity sha512-yhlQgA6mnOJUKOsRUFsgJdQCvkKhcz8tlZG5HBQfReYZy46OwLcY+Zia0mtdHsOo9y/hP+CxMN0TU9QxoOtG4g==
dependencies:
- graceful-fs "^4.1.2"
+ graceful-fs "^4.2.0"
jsonfile "^4.0.0"
universalify "^0.1.0"
fs-minipass@^1.2.5:
- version "1.2.5"
- resolved "http://registry.npm.taobao.org/fs-minipass/download/fs-minipass-1.2.5.tgz#06c277218454ec288df77ada54a03b8702aacb9d"
+ version "1.2.6"
+ resolved "https://registry.yarnpkg.com/fs-minipass/-/fs-minipass-1.2.6.tgz#2c5cc30ded81282bfe8a0d7c7c1853ddeb102c07"
+ integrity sha512-crhvyXcMejjv3Z5d2Fa9sf5xLYVCF5O1c71QxbVnbLsmYMBEvDAftewesN/HhY03YRoA7zOMxjNGrF5svGaaeQ==
dependencies:
minipass "^2.2.1"
fs-write-stream-atomic@^1.0.8:
version "1.0.10"
- resolved "http://registry.npm.taobao.org/fs-write-stream-atomic/download/fs-write-stream-atomic-1.0.10.tgz#b47df53493ef911df75731e70a9ded0189db40c9"
+ resolved "https://registry.yarnpkg.com/fs-write-stream-atomic/-/fs-write-stream-atomic-1.0.10.tgz#b47df53493ef911df75731e70a9ded0189db40c9"
+ integrity sha1-tH31NJPvkR33VzHnCp3tAYnbQMk=
dependencies:
graceful-fs "^4.1.2"
iferr "^0.1.5"
@@ -3917,39 +4249,31 @@ fs-write-stream-atomic@^1.0.8:
fs.realpath@^1.0.0:
version "1.0.0"
- resolved "http://registry.npm.taobao.org/fs.realpath/download/fs.realpath-1.0.0.tgz#1504ad2523158caa40db4a2787cb01411994ea4f"
-
-fsevents@^1.0.0, fsevents@^1.1.2, fsevents@^1.2.3:
- version "1.2.4"
- resolved "http://registry.npm.taobao.org/fsevents/download/fsevents-1.2.4.tgz#f41dcb1af2582af3692da36fc55cbd8e1041c426"
- dependencies:
- nan "^2.9.2"
- node-pre-gyp "^0.10.0"
+ resolved "https://registry.yarnpkg.com/fs.realpath/-/fs.realpath-1.0.0.tgz#1504ad2523158caa40db4a2787cb01411994ea4f"
+ integrity sha1-FQStJSMVjKpA20onh8sBQRmU6k8=
-fstream@^1.0.0, fstream@^1.0.2:
- version "1.0.11"
- resolved "http://registry.npm.taobao.org/fstream/download/fstream-1.0.11.tgz#5c1fb1f117477114f0632a0eb4b71b3cb0fd3171"
+fsevents@^1.2.7:
+ version "1.2.9"
+ resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-1.2.9.tgz#3f5ed66583ccd6f400b5a00db6f7e861363e388f"
+ integrity sha512-oeyj2H3EjjonWcFjD5NvZNE9Rqe4UW+nQBU2HNeKw0koVLEFIhtyETyAakeAM3de7Z/SW5kcA+fZUait9EApnw==
dependencies:
- graceful-fs "^4.1.2"
- inherits "~2.0.0"
- mkdirp ">=0.5 0"
- rimraf "2"
+ nan "^2.12.1"
+ node-pre-gyp "^0.12.0"
-function-bind@^1.0.2, function-bind@^1.1.0, function-bind@^1.1.1:
+function-bind@^1.1.1:
version "1.1.1"
- resolved "http://registry.npm.taobao.org/function-bind/download/function-bind-1.1.1.tgz#a56899d3ea3c9bab874bb9773b7c5ede92f4895d"
+ resolved "https://registry.yarnpkg.com/function-bind/-/function-bind-1.1.1.tgz#a56899d3ea3c9bab874bb9773b7c5ede92f4895d"
+ integrity sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==
-function.prototype.name@^1.0.3:
- version "1.1.0"
- resolved "http://registry.npm.taobao.org/function.prototype.name/download/function.prototype.name-1.1.0.tgz#8bd763cc0af860a859cc5d49384d74b932cd2327"
- dependencies:
- define-properties "^1.1.2"
- function-bind "^1.1.1"
- is-callable "^1.1.3"
+functional-red-black-tree@^1.0.1:
+ version "1.0.1"
+ resolved "https://registry.yarnpkg.com/functional-red-black-tree/-/functional-red-black-tree-1.0.1.tgz#1b0ab3bd553b2a0d6399d29c0e3ea0b252078327"
+ integrity sha1-GwqzvVU7Kg1jmdKcDj6gslIHgyc=
gauge@~2.7.3:
version "2.7.4"
- resolved "http://registry.npm.taobao.org/gauge/download/gauge-2.7.4.tgz#2c03405c7538c39d7eb37b317022e325fb018bf7"
+ resolved "https://registry.yarnpkg.com/gauge/-/gauge-2.7.4.tgz#2c03405c7538c39d7eb37b317022e325fb018bf7"
+ integrity sha1-LANAXHU4w51+s3sxcCLjJfsBi/c=
dependencies:
aproba "^1.0.3"
console-control-strings "^1.0.0"
@@ -3960,33 +4284,20 @@ gauge@~2.7.3:
strip-ansi "^3.0.1"
wide-align "^1.1.0"
-gaze@^1.0.0:
- version "1.1.3"
- resolved "http://registry.npm.taobao.org/gaze/download/gaze-1.1.3.tgz#c441733e13b927ac8c0ff0b4c3b033f28812924a"
- dependencies:
- globule "^1.0.0"
-
-generate-function@^2.0.0:
- version "2.0.0"
- resolved "http://registry.npm.taobao.org/generate-function/download/generate-function-2.0.0.tgz#6858fe7c0969b7d4e9093337647ac79f60dfbe74"
-
-generate-json-webpack-plugin@^0.2.2:
- version "0.2.2"
- resolved "http://registry.npm.taobao.org/generate-json-webpack-plugin/download/generate-json-webpack-plugin-0.2.2.tgz#fdb42821044b5b3fc3f0240ac26c25f7b3795db0"
-
-generate-object-property@^1.1.0:
- version "1.2.0"
- resolved "http://registry.npm.taobao.org/generate-object-property/download/generate-object-property-1.2.0.tgz#9c0e1c40308ce804f4783618b937fa88f99d50d0"
- dependencies:
- is-property "^1.0.0"
-
get-caller-file@^1.0.1:
- version "1.0.2"
- resolved "http://registry.npm.taobao.org/get-caller-file/download/get-caller-file-1.0.2.tgz#f702e63127e7e231c160a80c1554acb70d5047e5"
+ version "1.0.3"
+ resolved "https://registry.yarnpkg.com/get-caller-file/-/get-caller-file-1.0.3.tgz#f978fa4c90d1dfe7ff2d6beda2a515e713bdcf4a"
+ integrity sha512-3t6rVToeoZfYSGd8YoLFR2DJkiQrIiUrGcjvFX2mDw3bn6k2OtwHN0TNCLbBO+w8qTvimhDkv+LSscbJY1vE6w==
+
+get-caller-file@^2.0.1:
+ version "2.0.5"
+ resolved "https://registry.yarnpkg.com/get-caller-file/-/get-caller-file-2.0.5.tgz#4f94412a82db32f36e3b0b9741f8a97feb031f7e"
+ integrity sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==
get-pkg-repo@^1.0.0:
version "1.4.0"
- resolved "http://registry.npm.taobao.org/get-pkg-repo/download/get-pkg-repo-1.4.0.tgz#c73b489c06d80cc5536c2c853f9e05232056972d"
+ resolved "https://registry.yarnpkg.com/get-pkg-repo/-/get-pkg-repo-1.4.0.tgz#c73b489c06d80cc5536c2c853f9e05232056972d"
+ integrity sha1-xztInAbYDMVTbCyFP54FIyBWly0=
dependencies:
hosted-git-info "^2.1.4"
meow "^3.3.0"
@@ -3994,23 +4305,21 @@ get-pkg-repo@^1.0.0:
parse-github-repo-url "^1.3.0"
through2 "^2.0.0"
[email protected]:
- version "5.0.1"
- resolved "http://registry.npm.taobao.org/get-stdin/download/get-stdin-5.0.1.tgz#122e161591e21ff4c52530305693f20e6393a398"
[email protected], get-stdin@^7.0.0:
+ version "7.0.0"
+ resolved "https://registry.yarnpkg.com/get-stdin/-/get-stdin-7.0.0.tgz#8d5de98f15171a125c5e516643c7a6d0ea8a96f6"
+ integrity sha512-zRKcywvrXlXsA0v0i9Io4KDRaAw7+a1ZpjRwl9Wox8PFlVCCHra7E9c4kqXCoCM9nR5tBkaTTZRBoCm60bFqTQ==
get-stdin@^4.0.1:
version "4.0.1"
- resolved "http://registry.npm.taobao.org/get-stdin/download/get-stdin-4.0.1.tgz#b968c6b0a04384324902e8bf1a5df32579a450fe"
+ resolved "https://registry.yarnpkg.com/get-stdin/-/get-stdin-4.0.1.tgz#b968c6b0a04384324902e8bf1a5df32579a450fe"
+ integrity sha1-uWjGsKBDhDJJAui/Gl3zJXmkUP4=
get-stdin@^6.0.0:
version "6.0.0"
resolved "https://registry.yarnpkg.com/get-stdin/-/get-stdin-6.0.0.tgz#9e09bf712b360ab9225e812048f71fde9c89657b"
integrity sha512-jp4tHawyV7+fkkSKyvjuLZswblUtz+SQKzSWnBbii16BuZksJlU1wuBYXY75r+duh/llF1ur6oNwi+2ZzjKZ7g==
-get-stream@^3.0.0:
- version "3.0.0"
- resolved "http://registry.npm.taobao.org/get-stream/download/get-stream-3.0.0.tgz#8e943d1358dc37555054ecbe2edb05aa174ede14"
-
get-stream@^4.0.0:
version "4.1.0"
resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-4.1.0.tgz#c1b255575f3dc21d59bfc79cd3d2b46b1c3a54b5"
@@ -4020,17 +4329,31 @@ get-stream@^4.0.0:
get-value@^2.0.3, get-value@^2.0.6:
version "2.0.6"
- resolved "http://registry.npm.taobao.org/get-value/download/get-value-2.0.6.tgz#dc15ca1c672387ca76bd37ac0a395ba2042a2c28"
+ resolved "https://registry.yarnpkg.com/get-value/-/get-value-2.0.6.tgz#dc15ca1c672387ca76bd37ac0a395ba2042a2c28"
+ integrity sha1-3BXKHGcjh8p2vTesCjlbogQqLCg=
getpass@^0.1.1:
version "0.1.7"
- resolved "http://registry.npm.taobao.org/getpass/download/getpass-0.1.7.tgz#5eff8e3e684d569ae4cb2b1282604e8ba62149fa"
+ resolved "https://registry.yarnpkg.com/getpass/-/getpass-0.1.7.tgz#5eff8e3e684d569ae4cb2b1282604e8ba62149fa"
+ integrity sha1-Xv+OPmhNVprkyysSgmBOi6YhSfo=
dependencies:
assert-plus "^1.0.0"
-git-raw-commits@^1.3.0, git-raw-commits@^1.3.6:
[email protected]:
+ version "2.0.0"
+ resolved "https://registry.yarnpkg.com/git-raw-commits/-/git-raw-commits-2.0.0.tgz#d92addf74440c14bcc5c83ecce3fb7f8a79118b5"
+ integrity sha512-w4jFEJFgKXMQJ0H0ikBk2S+4KP2VEjhCvLCNqbNRQC8BgGWgLKNCO7a9K9LI+TVT7Gfoloje502sEnctibffgg==
+ dependencies:
+ dargs "^4.0.1"
+ lodash.template "^4.0.2"
+ meow "^4.0.0"
+ split2 "^2.0.0"
+ through2 "^2.0.0"
+
+git-raw-commits@^1.3.0:
version "1.3.6"
- resolved "http://registry.npm.taobao.org/git-raw-commits/download/git-raw-commits-1.3.6.tgz#27c35a32a67777c1ecd412a239a6c19d71b95aff"
+ resolved "https://registry.yarnpkg.com/git-raw-commits/-/git-raw-commits-1.3.6.tgz#27c35a32a67777c1ecd412a239a6c19d71b95aff"
+ integrity sha512-svsK26tQ8vEKnMshTDatSIQSMDdz8CxIIqKsvPqbtV23Etmw6VNaFAitu8zwZ0VrOne7FztwPyRLxK7/DIUTQg==
dependencies:
dargs "^4.0.1"
lodash.template "^4.0.2"
@@ -4040,74 +4363,58 @@ git-raw-commits@^1.3.0, git-raw-commits@^1.3.6:
git-remote-origin-url@^2.0.0:
version "2.0.0"
- resolved "http://registry.npm.taobao.org/git-remote-origin-url/download/git-remote-origin-url-2.0.0.tgz#5282659dae2107145a11126112ad3216ec5fa65f"
+ resolved "https://registry.yarnpkg.com/git-remote-origin-url/-/git-remote-origin-url-2.0.0.tgz#5282659dae2107145a11126112ad3216ec5fa65f"
+ integrity sha1-UoJlna4hBxRaERJhEq0yFuxfpl8=
dependencies:
gitconfiglocal "^1.0.0"
pify "^2.3.0"
-git-semver-tags@^1.3.0, git-semver-tags@^1.3.6:
- version "1.3.6"
- resolved "http://registry.npm.taobao.org/git-semver-tags/download/git-semver-tags-1.3.6.tgz#357ea01f7280794fe0927f2806bee6414d2caba5"
[email protected], git-semver-tags@^2.0.2:
+ version "2.0.2"
+ resolved "https://registry.yarnpkg.com/git-semver-tags/-/git-semver-tags-2.0.2.tgz#f506ec07caade191ac0c8d5a21bdb8131b4934e3"
+ integrity sha512-34lMF7Yo1xEmsK2EkbArdoU79umpvm0MfzaDkSNYSJqtM5QLAVTPWgpiXSVI5o/O9EvZPSrP4Zvnec/CqhSd5w==
dependencies:
meow "^4.0.0"
semver "^5.5.0"
gitconfiglocal@^1.0.0:
version "1.0.0"
- resolved "http://registry.npm.taobao.org/gitconfiglocal/download/gitconfiglocal-1.0.0.tgz#41d045f3851a5ea88f03f24ca1c6178114464b9b"
+ resolved "https://registry.yarnpkg.com/gitconfiglocal/-/gitconfiglocal-1.0.0.tgz#41d045f3851a5ea88f03f24ca1c6178114464b9b"
+ integrity sha1-QdBF84UaXqiPA/JMocYXgRRGS5s=
dependencies:
ini "^1.3.2"
-glob-base@^0.3.0:
- version "0.3.0"
- resolved "http://registry.npm.taobao.org/glob-base/download/glob-base-0.3.0.tgz#dbb164f6221b1c0b1ccf82aea328b497df0ea3c4"
- dependencies:
- glob-parent "^2.0.0"
- is-glob "^2.0.0"
-
-glob-parent@^2.0.0:
- version "2.0.0"
- resolved "http://registry.npm.taobao.org/glob-parent/download/glob-parent-2.0.0.tgz#81383d72db054fcccf5336daa902f182f6edbb28"
- dependencies:
- is-glob "^2.0.0"
-
glob-parent@^3.1.0:
version "3.1.0"
- resolved "http://registry.npm.taobao.org/glob-parent/download/glob-parent-3.1.0.tgz#9e6af6299d8d3bd2bd40430832bd113df906c5ae"
+ resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-3.1.0.tgz#9e6af6299d8d3bd2bd40430832bd113df906c5ae"
+ integrity sha1-nmr2KZ2NO9K9QEMIMr0RPfkGxa4=
dependencies:
is-glob "^3.1.0"
path-dirname "^1.0.0"
-glob2base@^0.0.12:
- version "0.0.12"
- resolved "http://registry.npm.taobao.org/glob2base/download/glob2base-0.0.12.tgz#9d419b3e28f12e83a362164a277055922c9c0d56"
+glob-parent@^5.0.0:
+ version "5.0.0"
+ resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-5.0.0.tgz#1dc99f0f39b006d3e92c2c284068382f0c20e954"
+ integrity sha512-Z2RwiujPRGluePM6j699ktJYxmPpJKCfpGA13jz2hmFZC7gKetzrWvg5KN3+OsIFmydGyZ1AVwERCq1w/ZZwRg==
dependencies:
- find-index "^0.1.1"
+ is-glob "^4.0.1"
[email protected]:
- version "7.1.1"
- resolved "http://registry.npm.taobao.org/glob/download/glob-7.1.1.tgz#805211df04faaf1c63a3600306cdf5ade50b2ec8"
[email protected]:
+ version "7.1.3"
+ resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.3.tgz#3960832d3f1574108342dafd3a67b332c0969df1"
+ integrity sha512-vcfuiIxogLV4DlGBHIUOwI0IbrJ8HWPc4MU7HzviGeNho/UJDfi6B5p3sHeWIQ0KGIU0Jpxi5ZHxemQfLkkAwQ==
dependencies:
fs.realpath "^1.0.0"
inflight "^1.0.4"
inherits "2"
- minimatch "^3.0.2"
- once "^1.3.0"
- path-is-absolute "^1.0.0"
-
-glob@^6.0.4:
- version "6.0.4"
- resolved "http://registry.npm.taobao.org/glob/download/glob-6.0.4.tgz#0f08860f6a155127b2fadd4f9ce24b1aab6e4d22"
- dependencies:
- inflight "^1.0.4"
- inherits "2"
- minimatch "2 || 3"
+ minimatch "^3.0.4"
once "^1.3.0"
path-is-absolute "^1.0.0"
-glob@^7.0.0, glob@^7.0.3, glob@^7.0.5, glob@^7.1.1, glob@^7.1.2, glob@~7.1.1:
- version "7.1.2"
- resolved "http://registry.npm.taobao.org/glob/download/glob-7.1.2.tgz#c19c9df9a028702d678612384a6552404c636d15"
+glob@^7.0.0, glob@^7.0.3, glob@^7.1.1, glob@^7.1.2, glob@^7.1.3, glob@^7.1.4:
+ version "7.1.4"
+ resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.4.tgz#aa608a2f6c577ad357e1ae5a5c26d9a8d1969255"
+ integrity sha512-hkLPepehmnKk41pUGm3sYxoFs/umurYfYJCerbXEyFIWcAzvpipAgVkBqqT9RBKMGjnq6kMuyYwha6csxbiM1A==
dependencies:
fs.realpath "^1.0.0"
inflight "^1.0.4"
@@ -4116,49 +4423,33 @@ glob@^7.0.0, glob@^7.0.3, glob@^7.0.5, glob@^7.1.1, glob@^7.1.2, glob@~7.1.1:
once "^1.3.0"
path-is-absolute "^1.0.0"
-glob@~5.0.0:
- version "5.0.15"
- resolved "http://registry.npm.taobao.org/glob/download/glob-5.0.15.tgz#1bc936b9e02f4a603fcc222ecf7633d30b8b93b1"
- dependencies:
- inflight "^1.0.4"
- inherits "2"
- minimatch "2 || 3"
- once "^1.3.0"
- path-is-absolute "^1.0.0"
-
-global-dirs@^0.1.0:
+global-dirs@^0.1.1:
version "0.1.1"
- resolved "http://registry.npm.taobao.org/global-dirs/download/global-dirs-0.1.1.tgz#b319c0dd4607f353f3be9cca4c72fc148c49f445"
+ resolved "https://registry.yarnpkg.com/global-dirs/-/global-dirs-0.1.1.tgz#b319c0dd4607f353f3be9cca4c72fc148c49f445"
+ integrity sha1-sxnA3UYH81PzvpzKTHL8FIxJ9EU=
dependencies:
ini "^1.3.4"
[email protected], global-modules@^1.0.0:
[email protected]:
+ version "2.0.0"
+ resolved "https://registry.yarnpkg.com/global-modules/-/global-modules-2.0.0.tgz#997605ad2345f27f51539bea26574421215c7780"
+ integrity sha512-NGbfmJBp9x8IxyJSd1P+otYK8vonoJactOogrVfFRIAEY1ukil8RSKDz2Yo7wh1oihl51l/r6W4epkeKJHqL8A==
+ dependencies:
+ global-prefix "^3.0.0"
+
+global-modules@^1.0.0:
version "1.0.0"
- resolved "http://registry.npm.taobao.org/global-modules/download/global-modules-1.0.0.tgz#6d770f0eb523ac78164d72b5e71a8877265cc3ea"
+ resolved "https://registry.yarnpkg.com/global-modules/-/global-modules-1.0.0.tgz#6d770f0eb523ac78164d72b5e71a8877265cc3ea"
+ integrity sha512-sKzpEkf11GpOFuw0Zzjzmt4B4UZwjOcG757PPvrfhxcLFbq0wpsgpOqxpxtxFiCG4DtG93M6XRVbF2oGdev7bg==
dependencies:
global-prefix "^1.0.1"
is-windows "^1.0.1"
resolve-dir "^1.0.0"
-global-modules@^0.2.3:
- version "0.2.3"
- resolved "http://registry.npm.taobao.org/global-modules/download/global-modules-0.2.3.tgz#ea5a3bed42c6d6ce995a4f8a1269b5dae223828d"
- dependencies:
- global-prefix "^0.1.4"
- is-windows "^0.2.0"
-
-global-prefix@^0.1.4:
- version "0.1.5"
- resolved "http://registry.npm.taobao.org/global-prefix/download/global-prefix-0.1.5.tgz#8d3bc6b8da3ca8112a160d8d496ff0462bfef78f"
- dependencies:
- homedir-polyfill "^1.0.0"
- ini "^1.3.4"
- is-windows "^0.2.0"
- which "^1.2.12"
-
global-prefix@^1.0.1:
version "1.0.2"
- resolved "http://registry.npm.taobao.org/global-prefix/download/global-prefix-1.0.2.tgz#dbf743c6c14992593c655568cb66ed32c0122ebe"
+ resolved "https://registry.yarnpkg.com/global-prefix/-/global-prefix-1.0.2.tgz#dbf743c6c14992593c655568cb66ed32c0122ebe"
+ integrity sha1-2/dDxsFJklk8ZVVoy2btMsASLr4=
dependencies:
expand-tilde "^2.0.2"
homedir-polyfill "^1.0.1"
@@ -4166,13 +4457,46 @@ global-prefix@^1.0.1:
is-windows "^1.0.1"
which "^1.2.14"
-globals@^9.18.0:
- version "9.18.0"
- resolved "http://registry.npm.taobao.org/globals/download/globals-9.18.0.tgz#aa3896b3e69b487f17e31ed2143d69a8e30c2d8a"
+global-prefix@^3.0.0:
+ version "3.0.0"
+ resolved "https://registry.yarnpkg.com/global-prefix/-/global-prefix-3.0.0.tgz#fc85f73064df69f50421f47f883fe5b913ba9b97"
+ integrity sha512-awConJSVCHVGND6x3tmMaKcQvwXLhjdkmomy2W+Goaui8YPgYgXJZewhg3fWC+DlfqqQuWg8AwqjGTD2nAPVWg==
+ dependencies:
+ ini "^1.3.5"
+ kind-of "^6.0.2"
+ which "^1.3.1"
+
+global@^4.3.0:
+ version "4.4.0"
+ resolved "https://registry.yarnpkg.com/global/-/global-4.4.0.tgz#3e7b105179006a323ed71aafca3e9c57a5cc6406"
+ integrity sha512-wv/LAoHdRE3BeTGz53FAamhGlPLhlssK45usmGFThIi4XqnBmjKQ16u+RNbP7WvigRZDxUsM0J3gcQ5yicaL0w==
+ dependencies:
+ min-document "^2.19.0"
+ process "^0.11.10"
+
+globals@^11.1.0, globals@^11.7.0:
+ version "11.12.0"
+ resolved "https://registry.yarnpkg.com/globals/-/globals-11.12.0.tgz#ab8795338868a0babd8525758018c2a7eb95c42e"
+ integrity sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==
+
+globby@^10.0.1:
+ version "10.0.1"
+ resolved "https://registry.yarnpkg.com/globby/-/globby-10.0.1.tgz#4782c34cb75dd683351335c5829cc3420e606b22"
+ integrity sha512-sSs4inE1FB2YQiymcmTv6NWENryABjUNPeWhOvmn4SjtKybglsyPZxFB3U1/+L1bYi0rNZDqCLlHyLYDl1Pq5A==
+ dependencies:
+ "@types/glob" "^7.1.1"
+ array-union "^2.1.0"
+ dir-glob "^3.0.1"
+ fast-glob "^3.0.3"
+ glob "^7.1.3"
+ ignore "^5.1.1"
+ merge2 "^1.2.3"
+ slash "^3.0.0"
globby@^6.1.0:
version "6.1.0"
- resolved "http://registry.npm.taobao.org/globby/download/globby-6.1.0.tgz#f5a6d70e8395e21c858fb0489d64df02424d506c"
+ resolved "https://registry.yarnpkg.com/globby/-/globby-6.1.0.tgz#f5a6d70e8395e21c858fb0489d64df02424d506c"
+ integrity sha1-9abXDoOV4hyFj7BInWTfAkJNUGw=
dependencies:
array-union "^1.0.1"
glob "^7.0.3"
@@ -4182,7 +4506,8 @@ globby@^6.1.0:
globby@^7.1.1:
version "7.1.1"
- resolved "http://registry.npm.taobao.org/globby/download/globby-7.1.1.tgz#fb2ccff9401f8600945dfada97440cca972b8680"
+ resolved "https://registry.yarnpkg.com/globby/-/globby-7.1.1.tgz#fb2ccff9401f8600945dfada97440cca972b8680"
+ integrity sha1-+yzP+UAfhgCUXfral0QMypcrhoA=
dependencies:
array-union "^1.0.1"
dir-glob "^2.0.0"
@@ -4191,107 +4516,64 @@ globby@^7.1.1:
pify "^3.0.0"
slash "^1.0.0"
-globule@^1.0.0:
- version "1.2.0"
- resolved "http://registry.npm.taobao.org/globule/download/globule-1.2.0.tgz#1dc49c6822dd9e8a2fa00ba2a295006e8664bd09"
- dependencies:
- glob "~7.1.1"
- lodash "~4.17.4"
- minimatch "~3.0.2"
-
-graceful-fs@^4.1.0, graceful-fs@^4.1.11, graceful-fs@^4.1.2, graceful-fs@^4.1.3, graceful-fs@^4.1.6, graceful-fs@^4.1.9:
- version "4.1.11"
- resolved "http://registry.npm.taobao.org/graceful-fs/download/graceful-fs-4.1.11.tgz#0e8bdfe4d1ddb8854d64e04ea7c00e2a026e5658"
+graceful-fs@^4.1.0, graceful-fs@^4.1.11, graceful-fs@^4.1.15, graceful-fs@^4.1.2, graceful-fs@^4.1.3, graceful-fs@^4.1.6, graceful-fs@^4.2.0:
+ version "4.2.0"
+ resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.0.tgz#8d8fdc73977cb04104721cb53666c1ca64cd328b"
+ integrity sha512-jpSvDPV4Cq/bgtpndIWbI5hmYxhQGHPC4d4cqBPb4DLniCfhJokdXhwhaDuLBGLQdvvRum/UiX6ECVIPvDXqdg==
growly@^1.3.0:
version "1.3.0"
- resolved "http://registry.npm.taobao.org/growly/download/growly-1.3.0.tgz#f10748cbe76af964b7c96c93c6bcc28af120c081"
-
-gud@^1.0.0:
- version "1.0.0"
- resolved "http://registry.npm.taobao.org/gud/download/gud-1.0.0.tgz#a489581b17e6a70beca9abe3ae57de7a499852c0"
- integrity sha1-pIlYGxfmpwvsqavjrlfeekmYUsA=
-
[email protected]:
- version "3.0.0"
- resolved "http://registry.npm.taobao.org/gzip-size/download/gzip-size-3.0.0.tgz#546188e9bdc337f673772f81660464b389dce520"
- dependencies:
- duplexer "^0.1.1"
+ resolved "https://registry.yarnpkg.com/growly/-/growly-1.3.0.tgz#f10748cbe76af964b7c96c93c6bcc28af120c081"
+ integrity sha1-8QdIy+dq+WS3yWyTxrzCivEgwIE=
-gzip-size@^4.1.0:
- version "4.1.0"
- resolved "http://registry.npm.taobao.org/gzip-size/download/gzip-size-4.1.0.tgz#8ae096257eabe7d69c45be2b67c448124ffb517c"
- dependencies:
- duplexer "^0.1.1"
- pify "^3.0.0"
-
-hammerjs@^2.0.8:
- version "2.0.8"
- resolved "http://registry.npm.taobao.org/hammerjs/download/hammerjs-2.0.8.tgz#04ef77862cff2bb79d30f7692095930222bf60f1"
-
-handle-thing@^1.2.5:
- version "1.2.5"
- resolved "http://registry.npm.taobao.org/handle-thing/download/handle-thing-1.2.5.tgz#fd7aad726bf1a5fd16dfc29b2f7a6601d27139c4"
+handle-thing@^2.0.0:
+ version "2.0.0"
+ resolved "https://registry.yarnpkg.com/handle-thing/-/handle-thing-2.0.0.tgz#0e039695ff50c93fc288557d696f3c1dc6776754"
+ integrity sha512-d4sze1JNC454Wdo2fkuyzCr6aHcbL6PGGuFAz0Li/NcOm1tCHGnWDRmJP85dh9IhQErTc2svWFEX5xHIOo//kQ==
-handlebars@^4.0.2, handlebars@^4.0.3:
- version "4.0.11"
- resolved "http://registry.npm.taobao.org/handlebars/download/handlebars-4.0.11.tgz#630a35dfe0294bc281edae6ffc5d329fc7982dcc"
+handlebars@^4.1.0, handlebars@^4.1.2:
+ version "4.1.2"
+ resolved "https://registry.yarnpkg.com/handlebars/-/handlebars-4.1.2.tgz#b6b37c1ced0306b221e094fc7aca3ec23b131b67"
+ integrity sha512-nvfrjqvt9xQ8Z/w0ijewdD/vvWDTOweBUm96NTr66Wfvo1mJenBLwcYmPs3TIBP5ruzYGD7Hx/DaM9RmhroGPw==
dependencies:
- async "^1.4.0"
+ neo-async "^2.6.0"
optimist "^0.6.1"
- source-map "^0.4.4"
+ source-map "^0.6.1"
optionalDependencies:
- uglify-js "^2.6"
+ uglify-js "^3.1.4"
har-schema@^2.0.0:
version "2.0.0"
- resolved "http://registry.npm.taobao.org/har-schema/download/har-schema-2.0.0.tgz#a94c2224ebcac04782a0d9035521f24735b7ec92"
-
-har-validator@~2.0.6:
- version "2.0.6"
- resolved "http://registry.npm.taobao.org/har-validator/download/har-validator-2.0.6.tgz#cdcbc08188265ad119b6a5a7c8ab70eecfb5d27d"
- dependencies:
- chalk "^1.1.1"
- commander "^2.9.0"
- is-my-json-valid "^2.12.4"
- pinkie-promise "^2.0.0"
-
-har-validator@~5.0.3:
- version "5.0.3"
- resolved "http://registry.npm.taobao.org/har-validator/download/har-validator-5.0.3.tgz#ba402c266194f15956ef15e0fcf242993f6a7dfd"
- dependencies:
- ajv "^5.1.0"
- har-schema "^2.0.0"
-
-has-ansi@^2.0.0:
- version "2.0.0"
- resolved "http://registry.npm.taobao.org/has-ansi/download/has-ansi-2.0.0.tgz#34f5049ce1ecdf2b0649af3ef24e45ed35416d91"
- dependencies:
- ansi-regex "^2.0.0"
-
-has-flag@^1.0.0:
- version "1.0.0"
- resolved "http://registry.npm.taobao.org/has-flag/download/has-flag-1.0.0.tgz#9d9e793165ce017a00f00418c43f942a7b1d11fa"
+ resolved "https://registry.yarnpkg.com/har-schema/-/har-schema-2.0.0.tgz#a94c2224ebcac04782a0d9035521f24735b7ec92"
+ integrity sha1-qUwiJOvKwEeCoNkDVSHyRzW37JI=
-has-flag@^2.0.0:
- version "2.0.0"
- resolved "http://registry.npm.taobao.org/has-flag/download/has-flag-2.0.0.tgz#e8207af1cc7b30d446cc70b734b5e8be18f88d51"
+har-validator@~5.1.0:
+ version "5.1.3"
+ resolved "https://registry.yarnpkg.com/har-validator/-/har-validator-5.1.3.tgz#1ef89ebd3e4996557675eed9893110dc350fa080"
+ integrity sha512-sNvOCzEQNr/qrvJgc3UG/kD4QtlHycrzwS+6mfTrrSq97BvaYcPZZI1ZSqGSPR73Cxn4LKTD4PttRwfU7jWq5g==
+ dependencies:
+ ajv "^6.5.5"
+ har-schema "^2.0.0"
has-flag@^3.0.0:
version "3.0.0"
- resolved "http://registry.npm.taobao.org/has-flag/download/has-flag-3.0.0.tgz#b5d454dc2199ae225699f3467e5a07f3b955bafd"
+ resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-3.0.0.tgz#b5d454dc2199ae225699f3467e5a07f3b955bafd"
+ integrity sha1-tdRU3CGZriJWmfNGfloH87lVuv0=
has-symbols@^1.0.0:
version "1.0.0"
- resolved "http://registry.npm.taobao.org/has-symbols/download/has-symbols-1.0.0.tgz#ba1a8f1af2a0fc39650f5c850367704122063b44"
+ resolved "https://registry.yarnpkg.com/has-symbols/-/has-symbols-1.0.0.tgz#ba1a8f1af2a0fc39650f5c850367704122063b44"
+ integrity sha1-uhqPGvKg/DllD1yFA2dwQSIGO0Q=
has-unicode@^2.0.0:
version "2.0.1"
- resolved "http://registry.npm.taobao.org/has-unicode/download/has-unicode-2.0.1.tgz#e0e6fe6a28cf51138855e086d1691e771de2a8b9"
+ resolved "https://registry.yarnpkg.com/has-unicode/-/has-unicode-2.0.1.tgz#e0e6fe6a28cf51138855e086d1691e771de2a8b9"
+ integrity sha1-4Ob+aijPUROIVeCG0Wkedx3iqLk=
has-value@^0.3.1:
version "0.3.1"
- resolved "http://registry.npm.taobao.org/has-value/download/has-value-0.3.1.tgz#7b1f58bada62ca827ec0a2078025654845995e1f"
+ resolved "https://registry.yarnpkg.com/has-value/-/has-value-0.3.1.tgz#7b1f58bada62ca827ec0a2078025654845995e1f"
+ integrity sha1-ex9YutpiyoJ+wKIHgCVlSEWZXh8=
dependencies:
get-value "^2.0.3"
has-values "^0.1.4"
@@ -4299,7 +4581,8 @@ has-value@^0.3.1:
has-value@^1.0.0:
version "1.0.0"
- resolved "http://registry.npm.taobao.org/has-value/download/has-value-1.0.0.tgz#18b281da585b1c5c51def24c930ed29a0be6b177"
+ resolved "https://registry.yarnpkg.com/has-value/-/has-value-1.0.0.tgz#18b281da585b1c5c51def24c930ed29a0be6b177"
+ integrity sha1-GLKB2lhbHFxR3vJMkw7SmgvmsXc=
dependencies:
get-value "^2.0.6"
has-values "^1.0.0"
@@ -4307,212 +4590,208 @@ has-value@^1.0.0:
has-values@^0.1.4:
version "0.1.4"
- resolved "http://registry.npm.taobao.org/has-values/download/has-values-0.1.4.tgz#6d61de95d91dfca9b9a02089ad384bff8f62b771"
+ resolved "https://registry.yarnpkg.com/has-values/-/has-values-0.1.4.tgz#6d61de95d91dfca9b9a02089ad384bff8f62b771"
+ integrity sha1-bWHeldkd/Km5oCCJrThL/49it3E=
has-values@^1.0.0:
version "1.0.0"
- resolved "http://registry.npm.taobao.org/has-values/download/has-values-1.0.0.tgz#95b0b63fec2146619a6fe57fe75628d5a39efe4f"
+ resolved "https://registry.yarnpkg.com/has-values/-/has-values-1.0.0.tgz#95b0b63fec2146619a6fe57fe75628d5a39efe4f"
+ integrity sha1-lbC2P+whRmGab+V/51Yo1aOe/k8=
dependencies:
is-number "^3.0.0"
kind-of "^4.0.0"
-has@^1.0.1:
- version "1.0.1"
- resolved "http://registry.npm.taobao.org/has/download/has-1.0.1.tgz#8461733f538b0837c9361e39a9ab9e9704dc2f28"
+has@^1.0.1, has@^1.0.3:
+ version "1.0.3"
+ resolved "https://registry.yarnpkg.com/has/-/has-1.0.3.tgz#722d7cbfc1f6aa8241f16dd814e011e1f41e8796"
+ integrity sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==
dependencies:
- function-bind "^1.0.2"
+ function-bind "^1.1.1"
hash-base@^3.0.0:
version "3.0.4"
- resolved "http://registry.npm.taobao.org/hash-base/download/hash-base-3.0.4.tgz#5fc8686847ecd73499403319a6b0a3f3f6ae4918"
+ resolved "https://registry.yarnpkg.com/hash-base/-/hash-base-3.0.4.tgz#5fc8686847ecd73499403319a6b0a3f3f6ae4918"
+ integrity sha1-X8hoaEfs1zSZQDMZprCj8/auSRg=
dependencies:
inherits "^2.0.1"
safe-buffer "^5.0.1"
-hash-sum@^1.0.2:
- version "1.0.2"
- resolved "http://registry.npm.taobao.org/hash-sum/download/hash-sum-1.0.2.tgz#33b40777754c6432573c120cc3808bbd10d47f04"
-
hash.js@^1.0.0, hash.js@^1.0.3:
- version "1.1.3"
- resolved "http://registry.npm.taobao.org/hash.js/download/hash.js-1.1.3.tgz#340dedbe6290187151c1ea1d777a3448935df846"
+ version "1.1.7"
+ resolved "https://registry.yarnpkg.com/hash.js/-/hash.js-1.1.7.tgz#0babca538e8d4ee4a0f8988d68866537a003cf42"
+ integrity sha512-taOaskGt4z4SOANNseOviYDvjEJinIkRgmp7LbKP2YTTmVxWBl87s/uzK9r+44BclBSp2X7K1hqeNfz9JbBeXA==
dependencies:
inherits "^2.0.3"
- minimalistic-assert "^1.0.0"
-
-hawk@~3.1.3:
- version "3.1.3"
- resolved "http://registry.npm.taobao.org/hawk/download/hawk-3.1.3.tgz#078444bd7c1640b0fe540d2c9b73d59678e8e1c4"
- dependencies:
- boom "2.x.x"
- cryptiles "2.x.x"
- hoek "2.x.x"
- sntp "1.x.x"
+ minimalistic-assert "^1.0.1"
[email protected], he@^1.1.0:
- version "1.1.1"
- resolved "http://registry.npm.taobao.org/he/download/he-1.1.1.tgz#93410fd21b009735151f8868c2f271f3427e23fd"
[email protected]:
+ version "1.2.0"
+ resolved "https://registry.yarnpkg.com/he/-/he-1.2.0.tgz#84ae65fa7eafb165fddb61566ae14baf05664f0f"
+ integrity sha512-F/1DnUGPopORZi0ni+CvrCgHQ5FyEAHRLSApuYWMmrbSwoN2Mn/7k+Gl38gJnR7yyDZk6WLXwiGod1JOWNDKGw==
hmac-drbg@^1.0.0:
version "1.0.1"
- resolved "http://registry.npm.taobao.org/hmac-drbg/download/hmac-drbg-1.0.1.tgz#d2745701025a6c775a6c545793ed502fc0c649a1"
+ resolved "https://registry.yarnpkg.com/hmac-drbg/-/hmac-drbg-1.0.1.tgz#d2745701025a6c775a6c545793ed502fc0c649a1"
+ integrity sha1-0nRXAQJabHdabFRXk+1QL8DGSaE=
dependencies:
hash.js "^1.0.3"
minimalistic-assert "^1.0.0"
minimalistic-crypto-utils "^1.0.1"
[email protected]:
- version "2.16.3"
- resolved "http://registry.npm.taobao.org/hoek/download/hoek-2.16.3.tgz#20bb7403d3cea398e91dc4710a8ff1b8274a25ed"
-
-hoist-non-react-statics@^2.3.1, hoist-non-react-statics@^2.5.0:
- version "2.5.0"
- resolved "http://registry.npm.taobao.org/hoist-non-react-statics/download/hoist-non-react-statics-2.5.0.tgz#d2ca2dfc19c5a91c5a6615ce8e564ef0347e2a40"
-
-home-or-tmp@^2.0.0:
- version "2.0.0"
- resolved "http://registry.npm.taobao.org/home-or-tmp/download/home-or-tmp-2.0.0.tgz#e36c3f2d2cae7d746a857e38d18d5f32a7882db8"
+hoist-non-react-statics@^3.3.0:
+ version "3.3.0"
+ resolved "https://registry.yarnpkg.com/hoist-non-react-statics/-/hoist-non-react-statics-3.3.0.tgz#b09178f0122184fb95acf525daaecb4d8f45958b"
+ integrity sha512-0XsbTXxgiaCDYDIWFcwkmerZPSwywfUqYmwT4jzewKTQSWoE6FCMoUVOeBJWK3E/CrWbxRG3m5GzY4lnIwGRBA==
dependencies:
- os-homedir "^1.0.0"
- os-tmpdir "^1.0.1"
+ react-is "^16.7.0"
-homedir-polyfill@^1.0.0, homedir-polyfill@^1.0.1:
- version "1.0.1"
- resolved "http://registry.npm.taobao.org/homedir-polyfill/download/homedir-polyfill-1.0.1.tgz#4c2bbc8a758998feebf5ed68580f76d46768b4bc"
+homedir-polyfill@^1.0.1:
+ version "1.0.3"
+ resolved "https://registry.yarnpkg.com/homedir-polyfill/-/homedir-polyfill-1.0.3.tgz#743298cef4e5af3e194161fbadcc2151d3a058e8"
+ integrity sha512-eSmmWE5bZTK2Nou4g0AI3zZ9rswp7GRKoKXS1BLUkvPviOqs4YTN1djQIqrXy9k5gEtdLPy86JjRwsNM9tnDcA==
dependencies:
parse-passwd "^1.0.0"
hosted-git-info@^2.1.4:
- version "2.6.0"
- resolved "http://registry.npm.taobao.org/hosted-git-info/download/hosted-git-info-2.6.0.tgz#23235b29ab230c576aab0d4f13fc046b0b038222"
+ version "2.7.1"
+ resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-2.7.1.tgz#97f236977bd6e125408930ff6de3eec6281ec047"
+ integrity sha512-7T/BxH19zbcCTa8XkMlbK5lTo1WtgkFi3GvdWEyNuc4Vex7/9Dqbnpsf4JMydcfj9HCg4zUWFTL3Za6lapg5/w==
hpack.js@^2.1.6:
version "2.1.6"
- resolved "http://registry.npm.taobao.org/hpack.js/download/hpack.js-2.1.6.tgz#87774c0949e513f42e84575b3c45681fade2a0b2"
+ resolved "https://registry.yarnpkg.com/hpack.js/-/hpack.js-2.1.6.tgz#87774c0949e513f42e84575b3c45681fade2a0b2"
+ integrity sha1-h3dMCUnlE/QuhFdbPEVoH63ioLI=
dependencies:
inherits "^2.0.1"
obuf "^1.0.0"
readable-stream "^2.0.1"
wbuf "^1.1.0"
-html-comment-regex@^1.1.0:
- version "1.1.1"
- resolved "http://registry.npm.taobao.org/html-comment-regex/download/html-comment-regex-1.1.1.tgz#668b93776eaae55ebde8f3ad464b307a4963625e"
-
html-encoding-sniffer@^1.0.2:
version "1.0.2"
- resolved "http://registry.npm.taobao.org/html-encoding-sniffer/download/html-encoding-sniffer-1.0.2.tgz#e70d84b94da53aa375e11fe3a351be6642ca46f8"
+ resolved "https://registry.yarnpkg.com/html-encoding-sniffer/-/html-encoding-sniffer-1.0.2.tgz#e70d84b94da53aa375e11fe3a351be6642ca46f8"
+ integrity sha512-71lZziiDnsuabfdYiUeWdCVyKuqwWi23L8YeIgV9jSSZHCtb6wB1BKWooH7L3tn4/FuZJMVWyNaIDr4RGmaSYw==
dependencies:
whatwg-encoding "^1.0.1"
-html-entities@^1.2.0:
+html-entities@^1.2.1:
version "1.2.1"
- resolved "http://registry.npm.taobao.org/html-entities/download/html-entities-1.2.1.tgz#0df29351f0721163515dfb9e5543e5f6eed5162f"
+ resolved "https://registry.yarnpkg.com/html-entities/-/html-entities-1.2.1.tgz#0df29351f0721163515dfb9e5543e5f6eed5162f"
+ integrity sha1-DfKTUfByEWNRXfueVUPl9u7VFi8=
+
+html-loader@^0.5.5:
+ version "0.5.5"
+ resolved "https://registry.yarnpkg.com/html-loader/-/html-loader-0.5.5.tgz#6356dbeb0c49756d8ebd5ca327f16ff06ab5faea"
+ integrity sha512-7hIW7YinOYUpo//kSYcPB6dCKoceKLmOwjEMmhIobHuWGDVl0Nwe4l68mdG/Ru0wcUxQjVMEoZpkalZ/SE7zog==
+ dependencies:
+ es6-templates "^0.2.3"
+ fastparse "^1.1.1"
+ html-minifier "^3.5.8"
+ loader-utils "^1.1.0"
+ object-assign "^4.1.1"
-html-minifier@^3.2.3:
- version "3.5.16"
- resolved "http://registry.npm.taobao.org/html-minifier/download/html-minifier-3.5.16.tgz#39f5aabaf78bdfc057fe67334226efd7f3851175"
+html-minifier@^3.5.20, html-minifier@^3.5.8:
+ version "3.5.21"
+ resolved "https://registry.yarnpkg.com/html-minifier/-/html-minifier-3.5.21.tgz#d0040e054730e354db008463593194015212d20c"
+ integrity sha512-LKUKwuJDhxNa3uf/LPR/KVjm/l3rBqtYeCOAekvG8F1vItxMUpueGd94i/asDDr8/1u7InxzFA5EeGjhhG5mMA==
dependencies:
camel-case "3.0.x"
- clean-css "4.1.x"
- commander "2.15.x"
- he "1.1.x"
+ clean-css "4.2.x"
+ commander "2.17.x"
+ he "1.2.x"
param-case "2.1.x"
relateurl "0.2.x"
- uglify-js "3.3.x"
-
[email protected]:
- version "2.0.1"
- resolved "http://registry.npm.taobao.org/html-parse-stringify2/download/html-parse-stringify2-2.0.1.tgz#dc5670b7292ca158b7bc916c9a6735ac8872834a"
- dependencies:
- void-elements "^2.0.1"
+ uglify-js "3.4.x"
[email protected]:
- version "3.0.6"
- resolved "http://registry.npm.taobao.org/html-webpack-plugin/download/html-webpack-plugin-3.0.6.tgz#d35b0452aae129a8a9f3fac44a169a625d8cf3fa"
[email protected]:
+ version "4.0.0-beta.5"
+ resolved "https://registry.yarnpkg.com/html-webpack-plugin/-/html-webpack-plugin-4.0.0-beta.5.tgz#2c53083c1151bfec20479b1f8aaf0039e77b5513"
+ integrity sha512-y5l4lGxOW3pz3xBTFdfB9rnnrWRPVxlAhX6nrBYIcW+2k2zC3mSp/3DxlWVCMBfnO6UAnoF8OcFn0IMy6kaKAQ==
dependencies:
- html-minifier "^3.2.3"
- loader-utils "^0.2.16"
- lodash "^4.17.3"
- pretty-error "^2.0.2"
- tapable "^1.0.0"
- toposort "^1.0.0"
+ html-minifier "^3.5.20"
+ loader-utils "^1.1.0"
+ lodash "^4.17.11"
+ pretty-error "^2.1.1"
+ tapable "^1.1.0"
util.promisify "1.0.0"
-htmlparser2@^3.9.1:
- version "3.9.2"
- resolved "http://registry.npm.taobao.org/htmlparser2/download/htmlparser2-3.9.2.tgz#1bdf87acca0f3f9e53fa4fcceb0f4b4cbb00b338"
+htmlparser2@^3.3.0:
+ version "3.10.1"
+ resolved "https://registry.yarnpkg.com/htmlparser2/-/htmlparser2-3.10.1.tgz#bd679dc3f59897b6a34bb10749c855bb53a9392f"
+ integrity sha512-IgieNijUMbkDovyoKObU1DUhm1iwNYE/fuifEoEHfd1oZKZDaONBSkal7Y01shxsM49R4XaMdGez3WnF9UfiCQ==
dependencies:
- domelementtype "^1.3.0"
+ domelementtype "^1.3.1"
domhandler "^2.3.0"
domutils "^1.5.1"
entities "^1.1.1"
inherits "^2.0.1"
- readable-stream "^2.0.2"
-
-htmlparser2@~3.3.0:
- version "3.3.0"
- resolved "http://registry.npm.taobao.org/htmlparser2/download/htmlparser2-3.3.0.tgz#cc70d05a59f6542e43f0e685c982e14c924a9efe"
- dependencies:
- domelementtype "1"
- domhandler "2.1"
- domutils "1.1"
- readable-stream "1.0"
+ readable-stream "^3.1.1"
http-deceiver@^1.2.7:
version "1.2.7"
- resolved "http://registry.npm.taobao.org/http-deceiver/download/http-deceiver-1.2.7.tgz#fa7168944ab9a519d337cb0bec7284dc3e723d87"
+ resolved "https://registry.yarnpkg.com/http-deceiver/-/http-deceiver-1.2.7.tgz#fa7168944ab9a519d337cb0bec7284dc3e723d87"
+ integrity sha1-+nFolEq5pRnTN8sL7HKE3D5yPYc=
[email protected]:
- version "1.6.2"
- resolved "http://registry.npm.taobao.org/http-errors/download/http-errors-1.6.2.tgz#0a002cc85707192a7e7946ceedc11155f60ec736"
[email protected]:
+ version "1.7.2"
+ resolved "https://registry.yarnpkg.com/http-errors/-/http-errors-1.7.2.tgz#4f5029cf13239f31036e5b2e55292bcfbcc85c8f"
+ integrity sha512-uUQBt3H/cSIVfch6i1EuPNy/YsRSOUBXTVfZ+yR7Zjez3qjBz6i9+i4zjNaoqcoFVI4lQJ5plg63TvGfRSDCRg==
dependencies:
- depd "1.1.1"
+ depd "~1.1.2"
inherits "2.0.3"
- setprototypeof "1.0.3"
- statuses ">= 1.3.1 < 2"
+ setprototypeof "1.1.1"
+ statuses ">= 1.5.0 < 2"
+ toidentifier "1.0.0"
http-errors@~1.6.2:
version "1.6.3"
- resolved "http://registry.npm.taobao.org/http-errors/download/http-errors-1.6.3.tgz#8b55680bb4be283a0b5bf4ea2e38580be1d9320d"
+ resolved "https://registry.yarnpkg.com/http-errors/-/http-errors-1.6.3.tgz#8b55680bb4be283a0b5bf4ea2e38580be1d9320d"
+ integrity sha1-i1VoC7S+KDoLW/TqLjhYC+HZMg0=
dependencies:
depd "~1.1.2"
inherits "2.0.3"
setprototypeof "1.1.0"
statuses ">= 1.4.0 < 2"
-http-parser-js@>=0.4.0:
- version "0.4.13"
- resolved "http://registry.npm.taobao.org/http-parser-js/download/http-parser-js-0.4.13.tgz#3bd6d6fde6e3172c9334c3b33b6c193d80fe1137"
-
-http-proxy-middleware@~0.17.4:
- version "0.17.4"
- resolved "http://registry.npm.taobao.org/http-proxy-middleware/download/http-proxy-middleware-0.17.4.tgz#642e8848851d66f09d4f124912846dbaeb41b833"
+http-errors@~1.7.2:
+ version "1.7.3"
+ resolved "https://registry.yarnpkg.com/http-errors/-/http-errors-1.7.3.tgz#6c619e4f9c60308c38519498c14fbb10aacebb06"
+ integrity sha512-ZTTX0MWrsQ2ZAhA1cejAwDLycFsd7I7nVtnkT3Ol0aqodaKW+0CTZDQ1uBv5whptCnc8e8HeRRJxRs0kmm/Qfw==
dependencies:
- http-proxy "^1.16.2"
- is-glob "^3.1.0"
- lodash "^4.17.2"
- micromatch "^2.3.11"
+ depd "~1.1.2"
+ inherits "2.0.4"
+ setprototypeof "1.1.1"
+ statuses ">= 1.5.0 < 2"
+ toidentifier "1.0.0"
+
+"http-parser-js@>=0.4.0 <0.4.11":
+ version "0.4.10"
+ resolved "https://registry.yarnpkg.com/http-parser-js/-/http-parser-js-0.4.10.tgz#92c9c1374c35085f75db359ec56cc257cbb93fa4"
+ integrity sha1-ksnBN0w1CF912zWexWzCV8u5P6Q=
+
+http-proxy-middleware@^0.19.1:
+ version "0.19.1"
+ resolved "https://registry.yarnpkg.com/http-proxy-middleware/-/http-proxy-middleware-0.19.1.tgz#183c7dc4aa1479150306498c210cdaf96080a43a"
+ integrity sha512-yHYTgWMQO8VvwNS22eLLloAkvungsKdKTLO8AJlftYIKNfJr3GK3zK0ZCfzDDGUBttdGc8xFy1mCitvNKQtC3Q==
+ dependencies:
+ http-proxy "^1.17.0"
+ is-glob "^4.0.0"
+ lodash "^4.17.11"
+ micromatch "^3.1.10"
-http-proxy@^1.16.2:
+http-proxy@^1.17.0:
version "1.17.0"
- resolved "http://registry.npm.taobao.org/http-proxy/download/http-proxy-1.17.0.tgz#7ad38494658f84605e2f6db4436df410f4e5be9a"
+ resolved "https://registry.yarnpkg.com/http-proxy/-/http-proxy-1.17.0.tgz#7ad38494658f84605e2f6db4436df410f4e5be9a"
+ integrity sha512-Taqn+3nNvYRfJ3bGvKfBSRwy1v6eePlm3oc/aWVxZp57DQr5Eq3xhKJi7Z4hZpS8PC3H4qI+Yly5EmFacGuA/g==
dependencies:
eventemitter3 "^3.0.0"
follow-redirects "^1.0.0"
requires-port "^1.0.0"
-http-signature@~1.1.0:
- version "1.1.1"
- resolved "http://registry.npm.taobao.org/http-signature/download/http-signature-1.1.1.tgz#df72e267066cd0ac67fb76adf8e134a8fbcf91bf"
- dependencies:
- assert-plus "^0.2.0"
- jsprim "^1.2.2"
- sshpk "^1.7.0"
-
http-signature@~1.2.0:
version "1.2.0"
- resolved "http://registry.npm.taobao.org/http-signature/download/http-signature-1.2.0.tgz#9aecd925114772f3d95b65a60abb8f7c18fbace1"
+ resolved "https://registry.yarnpkg.com/http-signature/-/http-signature-1.2.0.tgz#9aecd925114772f3d95b65a60abb8f7c18fbace1"
+ integrity sha1-muzZJRFHcvPZW2WmCruPfBj7rOE=
dependencies:
assert-plus "^1.0.0"
jsprim "^1.2.2"
@@ -4520,73 +4799,75 @@ http-signature@~1.2.0:
https-browserify@^1.0.0:
version "1.0.0"
- resolved "http://registry.npm.taobao.org/https-browserify/download/https-browserify-1.0.0.tgz#ec06c10e0a34c0f2faf199f7fd7fc78fffd03c73"
+ resolved "https://registry.yarnpkg.com/https-browserify/-/https-browserify-1.0.0.tgz#ec06c10e0a34c0f2faf199f7fd7fc78fffd03c73"
+ integrity sha1-7AbBDgo0wPL68Zn3/X/Hj//QPHM=
-husky@^1.2.1:
- version "1.2.1"
- resolved "https://registry.yarnpkg.com/husky/-/husky-1.2.1.tgz#33628f7013e345c1790a4dbe4642ad047f772dee"
- integrity sha512-4Ylal3HWhnDvIszuiyLoVrSGI7QLg/ogkNCoHE34c+yZYzb9kBZNrlTOsdw92cGi3cJT8pPb6CdVfxFkLnc8Dg==
+husky@^3.0.0:
+ version "3.0.0"
+ resolved "https://registry.yarnpkg.com/husky/-/husky-3.0.0.tgz#de63821a7049dc412b1afd753c259e2f6e227562"
+ integrity sha512-lKMEn7bRK+7f5eWPNGclDVciYNQt0GIkAQmhKl+uHP1qFzoN0h92kmH9HZ8PCwyVA2EQPD8KHf0FYWqnTxau+Q==
dependencies:
- cosmiconfig "^5.0.7"
+ cosmiconfig "^5.2.1"
execa "^1.0.0"
- find-up "^3.0.0"
- get-stdin "^6.0.0"
- is-ci "^1.2.1"
- pkg-dir "^3.0.0"
+ get-stdin "^7.0.0"
+ is-ci "^2.0.0"
+ opencollective-postinstall "^2.0.2"
+ pkg-dir "^4.2.0"
please-upgrade-node "^3.1.1"
- read-pkg "^4.0.1"
+ read-pkg "^5.1.1"
run-node "^1.0.0"
- slash "^2.0.0"
-
-i18next@^11.2.2:
- version "11.3.2"
- resolved "http://registry.npm.taobao.org/i18next/download/i18next-11.3.2.tgz#4a1a7bb14383ba6aed4abca139b03681fc96e023"
+ slash "^3.0.0"
[email protected]:
- version "0.4.19"
- resolved "http://registry.npm.taobao.org/iconv-lite/download/iconv-lite-0.4.19.tgz#f7468f60135f5e5dad3399c0a81be9a1603a082b"
-
-iconv-lite@^0.4.17, iconv-lite@^0.4.4, iconv-lite@~0.4.13:
- version "0.4.23"
- resolved "http://registry.npm.taobao.org/iconv-lite/download/iconv-lite-0.4.23.tgz#297871f63be507adcfbfca715d0cd0eed84e9a63"
[email protected], iconv-lite@^0.4.24, iconv-lite@^0.4.4:
+ version "0.4.24"
+ resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.24.tgz#2022b4b25fbddc21d2f524974a474aafe733908b"
+ integrity sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==
dependencies:
safer-buffer ">= 2.1.2 < 3"
icss-replace-symbols@^1.1.0:
version "1.1.0"
- resolved "http://registry.npm.taobao.org/icss-replace-symbols/download/icss-replace-symbols-1.1.0.tgz#06ea6f83679a7749e386cfe1fe812ae5db223ded"
+ resolved "https://registry.yarnpkg.com/icss-replace-symbols/-/icss-replace-symbols-1.1.0.tgz#06ea6f83679a7749e386cfe1fe812ae5db223ded"
+ integrity sha1-Bupvg2ead0njhs/h/oEq5dsiPe0=
-icss-utils@^2.1.0:
- version "2.1.0"
- resolved "http://registry.npm.taobao.org/icss-utils/download/icss-utils-2.1.0.tgz#83f0a0ec378bf3246178b6c2ad9136f135b1c962"
+icss-utils@^4.1.0:
+ version "4.1.1"
+ resolved "https://registry.yarnpkg.com/icss-utils/-/icss-utils-4.1.1.tgz#21170b53789ee27447c2f47dd683081403f9a467"
+ integrity sha512-4aFq7wvWyMHKgxsH8QQtGpvbASCf+eM3wPRLI6R+MgAnTCZ6STYsRvttLvRWK0Nfif5piF394St3HeJDaljGPA==
dependencies:
- postcss "^6.0.1"
+ postcss "^7.0.14"
ieee754@^1.1.4:
- version "1.1.11"
- resolved "http://registry.npm.taobao.org/ieee754/download/ieee754-1.1.11.tgz#c16384ffe00f5b7835824e67b6f2bd44a5229455"
+ version "1.1.13"
+ resolved "https://registry.yarnpkg.com/ieee754/-/ieee754-1.1.13.tgz#ec168558e95aa181fd87d37f55c32bbcb6708b84"
+ integrity sha512-4vf7I2LYV/HaWerSo3XmlMkp5eZ83i+/CDluXi/IGTs/O1sejBNhTtnxzmRZfvOUqj7lZjqHkeTvpgSFDlWZTg==
iferr@^0.1.5:
version "0.1.5"
- resolved "http://registry.npm.taobao.org/iferr/download/iferr-0.1.5.tgz#c60eed69e6d8fdb6b3104a1fcbca1c192dc5b501"
+ resolved "https://registry.yarnpkg.com/iferr/-/iferr-0.1.5.tgz#c60eed69e6d8fdb6b3104a1fcbca1c192dc5b501"
+ integrity sha1-xg7taebY/bazEEofy8ocGS3FtQE=
ignore-walk@^3.0.1:
version "3.0.1"
- resolved "http://registry.npm.taobao.org/ignore-walk/download/ignore-walk-3.0.1.tgz#a83e62e7d272ac0e3b551aaa82831a19b69f82f8"
+ resolved "https://registry.yarnpkg.com/ignore-walk/-/ignore-walk-3.0.1.tgz#a83e62e7d272ac0e3b551aaa82831a19b69f82f8"
+ integrity sha512-DTVlMx3IYPe0/JJcYP7Gxg7ttZZu3IInhuEhbchuqneY9wWe5Ojy2mXLBaQFUQmo0AW2r3qG7m1mg86js+gnlQ==
dependencies:
minimatch "^3.0.4"
ignore@^3.3.5:
- version "3.3.8"
- resolved "http://registry.npm.taobao.org/ignore/download/ignore-3.3.8.tgz#3f8e9c35d38708a3a7e0e9abb6c73e7ee7707b2b"
+ version "3.3.10"
+ resolved "https://registry.yarnpkg.com/ignore/-/ignore-3.3.10.tgz#0a97fb876986e8081c631160f8f9f389157f0043"
+ integrity sha512-Pgs951kaMm5GXP7MOvxERINe3gsaVjUWFm+UZPSq9xYriQAksyhg0csnS0KXSNRD5NmNdapXEpjxG49+AKh/ug==
-immutable@^3.7.4:
- version "3.8.2"
- resolved "http://registry.npm.taobao.org/immutable/download/immutable-3.8.2.tgz#c2439951455bb39913daf281376f1530e104adf3"
+ignore@^4.0.6:
+ version "4.0.6"
+ resolved "https://registry.yarnpkg.com/ignore/-/ignore-4.0.6.tgz#750e3db5862087b4737ebac8207ffd1ef27b25fc"
+ integrity sha512-cyFDKrqc/YdcWFniJhzI42+AzS+gNwmUzOSFcRCQYwySuBBBy/KjuxWLZ/FHEH6Moq1NizMOBWyTcv8O4OZIMg==
-immutable@~3.7.4:
- version "3.7.6"
- resolved "http://registry.npm.taobao.org/immutable/download/immutable-3.7.6.tgz#13b4d3cb12befa15482a26fe1b2ebae640071e4b"
+ignore@^5.1.1:
+ version "5.1.2"
+ resolved "https://registry.yarnpkg.com/ignore/-/ignore-5.1.2.tgz#e28e584d43ad7e92f96995019cc43b9e1ac49558"
+ integrity sha512-vdqWBp7MyzdmHkkRWV5nY+PfGRbYbahfuvsBCh277tq+w9zyNi7h5CYJCK0kmzti9kU+O/cB7sE8HvKv6aXAKQ==
import-fresh@^2.0.0:
version "2.0.0"
@@ -4596,223 +4877,216 @@ import-fresh@^2.0.0:
caller-path "^2.0.0"
resolve-from "^3.0.0"
-import-local@^1.0.0:
- version "1.0.0"
- resolved "http://registry.npm.taobao.org/import-local/download/import-local-1.0.0.tgz#5e4ffdc03f4fe6c009c6729beb29631c2f8227bc"
+import-fresh@^3.0.0:
+ version "3.1.0"
+ resolved "https://registry.yarnpkg.com/import-fresh/-/import-fresh-3.1.0.tgz#6d33fa1dcef6df930fae003446f33415af905118"
+ integrity sha512-PpuksHKGt8rXfWEr9m9EHIpgyyaltBy8+eF6GJM0QCAxMgxCfucMF3mjecK2QsJr0amJW7gTqh5/wht0z2UhEQ==
dependencies:
- pkg-dir "^2.0.0"
+ parent-module "^1.0.0"
+ resolve-from "^4.0.0"
+
[email protected], import-local@^2.0.0:
+ version "2.0.0"
+ resolved "https://registry.yarnpkg.com/import-local/-/import-local-2.0.0.tgz#55070be38a5993cf18ef6db7e961f5bee5c5a09d"
+ integrity sha512-b6s04m3O+s3CGSbqDIyP4R6aAwAeYlVq9+WUWep6iHa8ETRf9yei1U48C5MmfJmV9AiLYYBKPMq/W+/WRpQmCQ==
+ dependencies:
+ pkg-dir "^3.0.0"
resolve-cwd "^2.0.0"
imurmurhash@^0.1.4:
version "0.1.4"
- resolved "http://registry.npm.taobao.org/imurmurhash/download/imurmurhash-0.1.4.tgz#9218b9b2b928a238b13dc4fb6b6d576f231453ea"
-
-in-publish@^2.0.0:
- version "2.0.0"
- resolved "http://registry.npm.taobao.org/in-publish/download/in-publish-2.0.0.tgz#e20ff5e3a2afc2690320b6dc552682a9c7fadf51"
+ resolved "https://registry.yarnpkg.com/imurmurhash/-/imurmurhash-0.1.4.tgz#9218b9b2b928a238b13dc4fb6b6d576f231453ea"
+ integrity sha1-khi5srkoojixPcT7a21XbyMUU+o=
indent-string@^2.1.0:
version "2.1.0"
- resolved "http://registry.npm.taobao.org/indent-string/download/indent-string-2.1.0.tgz#8e2d48348742121b4a8218b7a137e9a52049dc80"
+ resolved "https://registry.yarnpkg.com/indent-string/-/indent-string-2.1.0.tgz#8e2d48348742121b4a8218b7a137e9a52049dc80"
+ integrity sha1-ji1INIdCEhtKghi3oTfppSBJ3IA=
dependencies:
repeating "^2.0.0"
indent-string@^3.0.0:
version "3.2.0"
- resolved "http://registry.npm.taobao.org/indent-string/download/indent-string-3.2.0.tgz#4a5fd6d27cc332f37e5419a504dbb837105c9289"
+ resolved "https://registry.yarnpkg.com/indent-string/-/indent-string-3.2.0.tgz#4a5fd6d27cc332f37e5419a504dbb837105c9289"
+ integrity sha1-Sl/W0nzDMvN+VBmlBNu4NxBckok=
indexes-of@^1.0.1:
version "1.0.1"
- resolved "http://registry.npm.taobao.org/indexes-of/download/indexes-of-1.0.1.tgz#f30f716c8e2bd346c7b67d3df3915566a7c05607"
-
[email protected]:
- version "0.0.1"
- resolved "http://registry.npm.taobao.org/indexof/download/indexof-0.0.1.tgz#82dc336d232b9062179d05ab3293a66059fd435d"
+ resolved "https://registry.yarnpkg.com/indexes-of/-/indexes-of-1.0.1.tgz#f30f716c8e2bd346c7b67d3df3915566a7c05607"
+ integrity sha1-8w9xbI4r00bHtn0985FVZqfAVgc=
inflight@^1.0.4:
version "1.0.6"
- resolved "http://registry.npm.taobao.org/inflight/download/inflight-1.0.6.tgz#49bd6331d7d02d0c09bc910a1075ba8165b56df9"
+ resolved "https://registry.yarnpkg.com/inflight/-/inflight-1.0.6.tgz#49bd6331d7d02d0c09bc910a1075ba8165b56df9"
+ integrity sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=
dependencies:
once "^1.3.0"
wrappy "1"
-inherits@2, [email protected], inherits@^2.0.1, inherits@^2.0.3, inherits@~2.0.0, inherits@~2.0.1, inherits@~2.0.3:
- version "2.0.3"
- resolved "http://registry.npm.taobao.org/inherits/download/inherits-2.0.3.tgz#633c2c83e3da42a502f52466022480f4208261de"
+inherits@2, [email protected], inherits@^2.0.1, inherits@^2.0.3, inherits@~2.0.1, inherits@~2.0.3:
+ version "2.0.4"
+ resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.4.tgz#0fa2c64f932917c3433a0ded55363aae37416b7c"
+ integrity sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==
[email protected]:
version "2.0.1"
- resolved "http://registry.npm.taobao.org/inherits/download/inherits-2.0.1.tgz#b17d08d326b4423e568eff719f91b0b1cbdf69f1"
+ resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.1.tgz#b17d08d326b4423e568eff719f91b0b1cbdf69f1"
+ integrity sha1-sX0I0ya0Qj5Wjv9xn5GwscvfafE=
-ini@^1.3.2, ini@^1.3.4, ini@~1.3.0:
- version "1.3.5"
- resolved "http://registry.npm.taobao.org/ini/download/ini-1.3.5.tgz#eee25f56db1c9ec6085e0c22778083f596abf927"
[email protected]:
+ version "2.0.3"
+ resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.3.tgz#633c2c83e3da42a502f52466022480f4208261de"
+ integrity sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=
[email protected]:
- version "1.2.3"
- resolved "http://registry.npm.taobao.org/inquirer/download/inquirer-1.2.3.tgz#4dec6f32f37ef7bb0b2ed3f1d1a5c3f545074918"
- dependencies:
- ansi-escapes "^1.1.0"
- chalk "^1.0.0"
- cli-cursor "^1.0.1"
- cli-width "^2.0.0"
- external-editor "^1.1.0"
- figures "^1.3.5"
- lodash "^4.3.0"
- mute-stream "0.0.6"
- pinkie-promise "^2.0.0"
- run-async "^2.2.0"
- rx "^4.1.0"
- string-width "^1.0.1"
- strip-ansi "^3.0.0"
- through "^2.3.6"
+ini@^1.3.2, ini@^1.3.4, ini@^1.3.5, ini@~1.3.0:
+ version "1.3.5"
+ resolved "https://registry.yarnpkg.com/ini/-/ini-1.3.5.tgz#eee25f56db1c9ec6085e0c22778083f596abf927"
+ integrity sha512-RZY5huIKCMRWDUqZlEi72f/lmXKMvuszcMBduliQ3nnWbx9X/ZBQO7DijMEYS9EhHBb2qacRUMtC7svLwe0lcw==
[email protected]:
- version "3.0.6"
- resolved "http://registry.npm.taobao.org/inquirer/download/inquirer-3.0.6.tgz#e04aaa9d05b7a3cb9b0f407d04375f0447190347"
[email protected]:
+ version "6.2.0"
+ resolved "https://registry.yarnpkg.com/inquirer/-/inquirer-6.2.0.tgz#51adcd776f661369dc1e894859c2560a224abdd8"
+ integrity sha512-QIEQG4YyQ2UYZGDC4srMZ7BjHOmNk1lR2JQj5UknBapklm6WHA+VVH7N+sUdX3A7NeCfGF8o4X1S3Ao7nAcIeg==
dependencies:
- ansi-escapes "^1.1.0"
- chalk "^1.0.0"
+ ansi-escapes "^3.0.0"
+ chalk "^2.0.0"
cli-cursor "^2.1.0"
cli-width "^2.0.0"
- external-editor "^2.0.1"
+ external-editor "^3.0.0"
figures "^2.0.0"
- lodash "^4.3.0"
+ lodash "^4.17.10"
mute-stream "0.0.7"
run-async "^2.2.0"
- rx "^4.1.0"
- string-width "^2.0.0"
- strip-ansi "^3.0.0"
+ rxjs "^6.1.0"
+ string-width "^2.1.0"
+ strip-ansi "^4.0.0"
through "^2.3.6"
[email protected]:
- version "3.3.0"
- resolved "http://registry.npm.taobao.org/inquirer/download/inquirer-3.3.0.tgz#9dd2f2ad765dcab1ff0443b491442a20ba227dc9"
+inquirer@^6.2.2:
+ version "6.4.1"
+ resolved "https://registry.yarnpkg.com/inquirer/-/inquirer-6.4.1.tgz#7bd9e5ab0567cd23b41b0180b68e0cfa82fc3c0b"
+ integrity sha512-/Jw+qPZx4EDYsaT6uz7F4GJRNFMRdKNeUZw3ZnKV8lyuUgz/YWRCSUAJMZSVhSq4Ec0R2oYnyi6b3d4JXcL5Nw==
dependencies:
- ansi-escapes "^3.0.0"
- chalk "^2.0.0"
+ ansi-escapes "^3.2.0"
+ chalk "^2.4.2"
cli-cursor "^2.1.0"
cli-width "^2.0.0"
- external-editor "^2.0.4"
+ external-editor "^3.0.3"
figures "^2.0.0"
- lodash "^4.3.0"
+ lodash "^4.17.11"
mute-stream "0.0.7"
run-async "^2.2.0"
- rx-lite "^4.0.8"
- rx-lite-aggregates "^4.0.8"
+ rxjs "^6.4.0"
string-width "^2.1.0"
- strip-ansi "^4.0.0"
+ strip-ansi "^5.1.0"
through "^2.3.6"
[email protected]:
- version "1.2.0"
- resolved "http://registry.npm.taobao.org/internal-ip/download/internal-ip-1.2.0.tgz#ae9fbf93b984878785d50a8de1b356956058cf5c"
+internal-ip@^4.3.0:
+ version "4.3.0"
+ resolved "https://registry.yarnpkg.com/internal-ip/-/internal-ip-4.3.0.tgz#845452baad9d2ca3b69c635a137acb9a0dad0907"
+ integrity sha512-S1zBo1D6zcsyuC6PMmY5+55YMILQ9av8lotMx447Bq6SAgo/sDK6y6uUKmuYhW7eacnIhFfsPmCNYdDzsnnDCg==
dependencies:
- meow "^3.3.0"
-
-interpret@^1.0.0:
- version "1.1.0"
- resolved "http://registry.npm.taobao.org/interpret/download/interpret-1.1.0.tgz#7ed1b1410c6a0e0f78cf95d3b8440c63f78b8614"
+ default-gateway "^4.2.0"
+ ipaddr.js "^1.9.0"
-intersperse@^1.0.0:
- version "1.0.0"
- resolved "http://registry.npm.taobao.org/intersperse/download/intersperse-1.0.0.tgz#f2561fb1cfef9f5277cc3347a22886b4351a5181"
- integrity sha1-8lYfsc/vn1J3zDNHoiiGtDUaUYE=
[email protected], interpret@^1.0.0:
+ version "1.2.0"
+ resolved "https://registry.yarnpkg.com/interpret/-/interpret-1.2.0.tgz#d5061a6224be58e8083985f5014d844359576296"
+ integrity sha512-mT34yGKMNceBQUoVn7iCDKDntA7SC6gycMAWzGx1z/CMCTV7b2AAtXlo3nRyHZ1FelRkQbQjprHSYGwzLtkVbw==
-invariant@^2.0.0, invariant@^2.2.2, invariant@^2.2.4:
+invariant@^2.2.2, invariant@^2.2.4:
version "2.2.4"
- resolved "http://registry.npm.taobao.org/invariant/download/invariant-2.2.4.tgz#610f3c92c9359ce1db616e538008d23ff35158e6"
+ resolved "https://registry.yarnpkg.com/invariant/-/invariant-2.2.4.tgz#610f3c92c9359ce1db616e538008d23ff35158e6"
+ integrity sha512-phJfQVBuaJM5raOpJjSfkiD6BpbCE4Ns//LaXl6wGYtUBY83nWS6Rf9tXm2e8VaK60JEjYldbPif/A2B1C2gNA==
dependencies:
loose-envify "^1.0.0"
-invert-kv@^1.0.0:
- version "1.0.0"
- resolved "http://registry.npm.taobao.org/invert-kv/download/invert-kv-1.0.0.tgz#104a8e4aaca6d3d8cd157a8ef8bfab2d7a3ffdb6"
+invert-kv@^2.0.0:
+ version "2.0.0"
+ resolved "https://registry.yarnpkg.com/invert-kv/-/invert-kv-2.0.0.tgz#7393f5afa59ec9ff5f67a27620d11c226e3eec02"
+ integrity sha512-wPVv/y/QQ/Uiirj/vh3oP+1Ww+AWehmi1g5fFWGPF6IpCBCDVrhgHRMvrLfdYcwDh3QJbGXDW4JAuzxElLSqKA==
+
+ip-regex@^2.1.0:
+ version "2.1.0"
+ resolved "https://registry.yarnpkg.com/ip-regex/-/ip-regex-2.1.0.tgz#fa78bf5d2e6913c911ce9f819ee5146bb6d844e9"
+ integrity sha1-+ni/XS5pE8kRzp+BnuUUa7bYROk=
ip@^1.1.0, ip@^1.1.5:
version "1.1.5"
- resolved "http://registry.npm.taobao.org/ip/download/ip-1.1.5.tgz#bdded70114290828c0a039e72ef25f5aaec4354a"
-
[email protected]:
- version "1.6.0"
- resolved "http://registry.npm.taobao.org/ipaddr.js/download/ipaddr.js-1.6.0.tgz#e3fa357b773da619f26e95f049d055c72796f86b"
+ resolved "https://registry.yarnpkg.com/ip/-/ip-1.1.5.tgz#bdded70114290828c0a039e72ef25f5aaec4354a"
+ integrity sha1-vd7XARQpCCjAoDnnLvJfWq7ENUo=
-is-absolute-url@^2.0.0:
- version "2.1.0"
- resolved "http://registry.npm.taobao.org/is-absolute-url/download/is-absolute-url-2.1.0.tgz#50530dfb84fcc9aa7dbe7852e83a37b93b9f2aa6"
[email protected], ipaddr.js@^1.9.0:
+ version "1.9.0"
+ resolved "https://registry.yarnpkg.com/ipaddr.js/-/ipaddr.js-1.9.0.tgz#37df74e430a0e47550fe54a2defe30d8acd95f65"
+ integrity sha512-M4Sjn6N/+O6/IXSJseKqHoFc+5FdGJ22sXqnjTpdZweHK64MzEPAyQZyEU3R/KRv2GLoa7nNtg/C2Ev6m7z+eA==
is-accessor-descriptor@^0.1.6:
version "0.1.6"
- resolved "http://registry.npm.taobao.org/is-accessor-descriptor/download/is-accessor-descriptor-0.1.6.tgz#a9e12cb3ae8d876727eeef3843f8a0897b5c98d6"
+ resolved "https://registry.yarnpkg.com/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz#a9e12cb3ae8d876727eeef3843f8a0897b5c98d6"
+ integrity sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=
dependencies:
kind-of "^3.0.2"
is-accessor-descriptor@^1.0.0:
version "1.0.0"
- resolved "http://registry.npm.taobao.org/is-accessor-descriptor/download/is-accessor-descriptor-1.0.0.tgz#169c2f6d3df1f992618072365c9b0ea1f6878656"
+ resolved "https://registry.yarnpkg.com/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz#169c2f6d3df1f992618072365c9b0ea1f6878656"
+ integrity sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==
dependencies:
kind-of "^6.0.0"
is-arrayish@^0.2.1:
version "0.2.1"
- resolved "http://registry.npm.taobao.org/is-arrayish/download/is-arrayish-0.2.1.tgz#77c99840527aa8ecb1a8ba697b80645a7a926a9d"
+ resolved "https://registry.yarnpkg.com/is-arrayish/-/is-arrayish-0.2.1.tgz#77c99840527aa8ecb1a8ba697b80645a7a926a9d"
+ integrity sha1-d8mYQFJ6qOyxqLppe4BkWnqSap0=
is-binary-path@^1.0.0:
version "1.0.1"
- resolved "http://registry.npm.taobao.org/is-binary-path/download/is-binary-path-1.0.1.tgz#75f16642b480f187a711c814161fd3a4a7655898"
+ resolved "https://registry.yarnpkg.com/is-binary-path/-/is-binary-path-1.0.1.tgz#75f16642b480f187a711c814161fd3a4a7655898"
+ integrity sha1-dfFmQrSA8YenEcgUFh/TpKdlWJg=
dependencies:
binary-extensions "^1.0.0"
-is-boolean-object@^1.0.0:
- version "1.0.0"
- resolved "http://registry.npm.taobao.org/is-boolean-object/download/is-boolean-object-1.0.0.tgz#98f8b28030684219a95f375cfbd88ce3405dff93"
-
-is-buffer@^1.1.5, is-buffer@~1.1.1:
+is-buffer@^1.1.5:
version "1.1.6"
- resolved "http://registry.npm.taobao.org/is-buffer/download/is-buffer-1.1.6.tgz#efaa2ea9daa0d7ab2ea13a97b2b8ad51fefbe8be"
-
-is-builtin-module@^1.0.0:
- version "1.0.0"
- resolved "http://registry.npm.taobao.org/is-builtin-module/download/is-builtin-module-1.0.0.tgz#540572d34f7ac3119f8f76c30cbc1b1e037affbe"
- dependencies:
- builtin-modules "^1.0.0"
-
-is-callable@^1.1.1, is-callable@^1.1.3:
- version "1.1.3"
- resolved "http://registry.npm.taobao.org/is-callable/download/is-callable-1.1.3.tgz#86eb75392805ddc33af71c92a0eedf74ee7604b2"
+ resolved "https://registry.yarnpkg.com/is-buffer/-/is-buffer-1.1.6.tgz#efaa2ea9daa0d7ab2ea13a97b2b8ad51fefbe8be"
+ integrity sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==
-is-ci@^1.0.10:
- version "1.1.0"
- resolved "http://registry.npm.taobao.org/is-ci/download/is-ci-1.1.0.tgz#247e4162e7860cebbdaf30b774d6b0ac7dcfe7a5"
- dependencies:
- ci-info "^1.0.0"
+is-callable@^1.1.4:
+ version "1.1.4"
+ resolved "https://registry.yarnpkg.com/is-callable/-/is-callable-1.1.4.tgz#1e1adf219e1eeb684d691f9d6a05ff0d30a24d75"
+ integrity sha512-r5p9sxJjYnArLjObpjA4xu5EKI3CuKHkJXMhT7kwbpUyIFD1n5PMAsoPvWnvtZiNz7LjkYDRZhd7FlI0eMijEA==
-is-ci@^1.2.1:
- version "1.2.1"
- resolved "https://registry.yarnpkg.com/is-ci/-/is-ci-1.2.1.tgz#e3779c8ee17fccf428488f6e281187f2e632841c"
- integrity sha512-s6tfsaQaQi3JNciBH6shVqEDvhGut0SUXr31ag8Pd8BBbVVlcGfWhpPmEOoM6RJ5TFhbypvf5yyRw/VXW1IiWg==
+is-ci@^2.0.0:
+ version "2.0.0"
+ resolved "https://registry.yarnpkg.com/is-ci/-/is-ci-2.0.0.tgz#6bc6334181810e04b5c22b3d589fdca55026404c"
+ integrity sha512-YfJT7rkpQB0updsdHLGWrvhBJfcfzNNawYDNIyQXJz0IViGf75O8EBPKSdvw2rF+LGCsX4FZ8tcr3b19LcZq4w==
dependencies:
- ci-info "^1.5.0"
+ ci-info "^2.0.0"
is-data-descriptor@^0.1.4:
version "0.1.4"
- resolved "http://registry.npm.taobao.org/is-data-descriptor/download/is-data-descriptor-0.1.4.tgz#0b5ee648388e2c860282e793f1856fec3f301b56"
+ resolved "https://registry.yarnpkg.com/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz#0b5ee648388e2c860282e793f1856fec3f301b56"
+ integrity sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y=
dependencies:
kind-of "^3.0.2"
is-data-descriptor@^1.0.0:
version "1.0.0"
- resolved "http://registry.npm.taobao.org/is-data-descriptor/download/is-data-descriptor-1.0.0.tgz#d84876321d0e7add03990406abbbbd36ba9268c7"
+ resolved "https://registry.yarnpkg.com/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz#d84876321d0e7add03990406abbbbd36ba9268c7"
+ integrity sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==
dependencies:
kind-of "^6.0.0"
is-date-object@^1.0.1:
version "1.0.1"
- resolved "http://registry.npm.taobao.org/is-date-object/download/is-date-object-1.0.1.tgz#9aa20eb6aeebbff77fbd33e74ca01b33581d3a16"
+ resolved "https://registry.yarnpkg.com/is-date-object/-/is-date-object-1.0.1.tgz#9aa20eb6aeebbff77fbd33e74ca01b33581d3a16"
+ integrity sha1-mqIOtq7rv/d/vTPnTKAbM1gdOhY=
is-descriptor@^0.1.0:
version "0.1.6"
- resolved "http://registry.npm.taobao.org/is-descriptor/download/is-descriptor-0.1.6.tgz#366d8240dde487ca51823b1ab9f07a10a78251ca"
+ resolved "https://registry.yarnpkg.com/is-descriptor/-/is-descriptor-0.1.6.tgz#366d8240dde487ca51823b1ab9f07a10a78251ca"
+ integrity sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==
dependencies:
is-accessor-descriptor "^0.1.6"
is-data-descriptor "^0.1.4"
@@ -4820,7 +5094,8 @@ is-descriptor@^0.1.0:
is-descriptor@^1.0.0, is-descriptor@^1.0.2:
version "1.0.2"
- resolved "http://registry.npm.taobao.org/is-descriptor/download/is-descriptor-1.0.2.tgz#3b159746a66604b04f8c81524ba365c5f14d86ec"
+ resolved "https://registry.yarnpkg.com/is-descriptor/-/is-descriptor-1.0.2.tgz#3b159746a66604b04f8c81524ba365c5f14d86ec"
+ integrity sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==
dependencies:
is-accessor-descriptor "^1.0.0"
is-data-descriptor "^1.0.0"
@@ -4828,812 +5103,818 @@ is-descriptor@^1.0.0, is-descriptor@^1.0.2:
is-directory@^0.3.1:
version "0.3.1"
- resolved "http://registry.npm.taobao.org/is-directory/download/is-directory-0.3.1.tgz#61339b6f2475fc772fd9c9d83f5c8575dc154ae1"
-
-is-dotfile@^1.0.0:
- version "1.0.3"
- resolved "http://registry.npm.taobao.org/is-dotfile/download/is-dotfile-1.0.3.tgz#a6a2f32ffd2dfb04f5ca25ecd0f6b83cf798a1e1"
-
-is-equal-shallow@^0.1.3:
- version "0.1.3"
- resolved "http://registry.npm.taobao.org/is-equal-shallow/download/is-equal-shallow-0.1.3.tgz#2238098fc221de0bcfa5d9eac4c45d638aa1c534"
- dependencies:
- is-primitive "^2.0.0"
+ resolved "https://registry.yarnpkg.com/is-directory/-/is-directory-0.3.1.tgz#61339b6f2475fc772fd9c9d83f5c8575dc154ae1"
+ integrity sha1-YTObbyR1/Hcv2cnYP1yFddwVSuE=
is-extendable@^0.1.0, is-extendable@^0.1.1:
version "0.1.1"
- resolved "http://registry.npm.taobao.org/is-extendable/download/is-extendable-0.1.1.tgz#62b110e289a471418e3ec36a617d472e301dfc89"
+ resolved "https://registry.yarnpkg.com/is-extendable/-/is-extendable-0.1.1.tgz#62b110e289a471418e3ec36a617d472e301dfc89"
+ integrity sha1-YrEQ4omkcUGOPsNqYX1HLjAd/Ik=
-is-extendable@^1.0.1:
+is-extendable@^1.0.0, is-extendable@^1.0.1:
version "1.0.1"
- resolved "http://registry.npm.taobao.org/is-extendable/download/is-extendable-1.0.1.tgz#a7470f9e426733d81bd81e1155264e3a3507cab4"
+ resolved "https://registry.yarnpkg.com/is-extendable/-/is-extendable-1.0.1.tgz#a7470f9e426733d81bd81e1155264e3a3507cab4"
+ integrity sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==
dependencies:
is-plain-object "^2.0.4"
-is-extglob@^1.0.0:
- version "1.0.0"
- resolved "http://registry.npm.taobao.org/is-extglob/download/is-extglob-1.0.0.tgz#ac468177c4943405a092fc8f29760c6ffc6206c0"
-
is-extglob@^2.1.0, is-extglob@^2.1.1:
version "2.1.1"
- resolved "http://registry.npm.taobao.org/is-extglob/download/is-extglob-2.1.1.tgz#a88c02535791f02ed37c76a1b9ea9773c833f8c2"
+ resolved "https://registry.yarnpkg.com/is-extglob/-/is-extglob-2.1.1.tgz#a88c02535791f02ed37c76a1b9ea9773c833f8c2"
+ integrity sha1-qIwCU1eR8C7TfHahueqXc8gz+MI=
is-finite@^1.0.0:
version "1.0.2"
- resolved "http://registry.npm.taobao.org/is-finite/download/is-finite-1.0.2.tgz#cc6677695602be550ef11e8b4aa6305342b6d0aa"
+ resolved "https://registry.yarnpkg.com/is-finite/-/is-finite-1.0.2.tgz#cc6677695602be550ef11e8b4aa6305342b6d0aa"
+ integrity sha1-zGZ3aVYCvlUO8R6LSqYwU0K20Ko=
dependencies:
number-is-nan "^1.0.0"
is-fullwidth-code-point@^1.0.0:
version "1.0.0"
- resolved "http://registry.npm.taobao.org/is-fullwidth-code-point/download/is-fullwidth-code-point-1.0.0.tgz#ef9e31386f031a7f0d643af82fde50c457ef00cb"
+ resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz#ef9e31386f031a7f0d643af82fde50c457ef00cb"
+ integrity sha1-754xOG8DGn8NZDr4L95QxFfvAMs=
dependencies:
number-is-nan "^1.0.0"
is-fullwidth-code-point@^2.0.0:
version "2.0.0"
- resolved "http://registry.npm.taobao.org/is-fullwidth-code-point/download/is-fullwidth-code-point-2.0.0.tgz#a3b30a5c4f199183167aaab93beefae3ddfb654f"
-
-is-generator-fn@^1.0.0:
- version "1.0.0"
- resolved "http://registry.npm.taobao.org/is-generator-fn/download/is-generator-fn-1.0.0.tgz#969d49e1bb3329f6bb7f09089be26578b2ddd46a"
+ resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz#a3b30a5c4f199183167aaab93beefae3ddfb654f"
+ integrity sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=
-is-glob@^2.0.0, is-glob@^2.0.1:
- version "2.0.1"
- resolved "http://registry.npm.taobao.org/is-glob/download/is-glob-2.0.1.tgz#d096f926a3ded5600f3fdfd91198cb0888c2d863"
- dependencies:
- is-extglob "^1.0.0"
+is-generator-fn@^2.0.0:
+ version "2.1.0"
+ resolved "https://registry.yarnpkg.com/is-generator-fn/-/is-generator-fn-2.1.0.tgz#7d140adc389aaf3011a8f2a2a4cfa6faadffb118"
+ integrity sha512-cTIB4yPYL/Grw0EaSzASzg6bBy9gqCofvWN8okThAYIxKJZC+udlRAmGbM0XLeniEJSs8uEgHPGuHSe1XsOLSQ==
is-glob@^3.1.0:
version "3.1.0"
- resolved "http://registry.npm.taobao.org/is-glob/download/is-glob-3.1.0.tgz#7ba5ae24217804ac70707b96922567486cc3e84a"
+ resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-3.1.0.tgz#7ba5ae24217804ac70707b96922567486cc3e84a"
+ integrity sha1-e6WuJCF4BKxwcHuWkiVnSGzD6Eo=
dependencies:
is-extglob "^2.1.0"
-is-glob@^4.0.0:
- version "4.0.0"
- resolved "http://registry.npm.taobao.org/is-glob/download/is-glob-4.0.0.tgz#9521c76845cc2610a85203ddf080a958c2ffabc0"
+is-glob@^4.0.0, is-glob@^4.0.1:
+ version "4.0.1"
+ resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-4.0.1.tgz#7567dbe9f2f5e2467bc77ab83c4a29482407a5dc"
+ integrity sha512-5G0tKtBTFImOqDnLB2hG6Bp2qcKEFduo4tZu9MT/H6NQv/ghhy30o55ufafxJ/LdH79LLs2Kfrn85TLKyA7BUg==
dependencies:
is-extglob "^2.1.1"
-is-my-ip-valid@^1.0.0:
- version "1.0.0"
- resolved "http://registry.npm.taobao.org/is-my-ip-valid/download/is-my-ip-valid-1.0.0.tgz#7b351b8e8edd4d3995d4d066680e664d94696824"
-
-is-my-json-valid@^2.12.4:
- version "2.17.2"
- resolved "http://registry.npm.taobao.org/is-my-json-valid/download/is-my-json-valid-2.17.2.tgz#6b2103a288e94ef3de5cf15d29dd85fc4b78d65c"
- dependencies:
- generate-function "^2.0.0"
- generate-object-property "^1.1.0"
- is-my-ip-valid "^1.0.0"
- jsonpointer "^4.0.0"
- xtend "^4.0.0"
-
-is-negative-zero@^2.0.0:
- version "2.0.0"
- resolved "http://registry.npm.taobao.org/is-negative-zero/download/is-negative-zero-2.0.0.tgz#9553b121b0fac28869da9ed459e20c7543788461"
-
-is-number-object@^1.0.3:
- version "1.0.3"
- resolved "http://registry.npm.taobao.org/is-number-object/download/is-number-object-1.0.3.tgz#f265ab89a9f445034ef6aff15a8f00b00f551799"
-
-is-number@^2.1.0:
- version "2.1.0"
- resolved "http://registry.npm.taobao.org/is-number/download/is-number-2.1.0.tgz#01fcbbb393463a548f2f466cce16dece49db908f"
- dependencies:
- kind-of "^3.0.2"
-
is-number@^3.0.0:
version "3.0.0"
- resolved "http://registry.npm.taobao.org/is-number/download/is-number-3.0.0.tgz#24fd6201a4782cf50561c810276afc7d12d71195"
+ resolved "https://registry.yarnpkg.com/is-number/-/is-number-3.0.0.tgz#24fd6201a4782cf50561c810276afc7d12d71195"
+ integrity sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=
dependencies:
kind-of "^3.0.2"
-is-number@^4.0.0:
- version "4.0.0"
- resolved "http://registry.npm.taobao.org/is-number/download/is-number-4.0.0.tgz#0026e37f5454d73e356dfe6564699867c6a7f0ff"
+is-number@^7.0.0:
+ version "7.0.0"
+ resolved "https://registry.yarnpkg.com/is-number/-/is-number-7.0.0.tgz#7535345b896734d5f80c4d06c50955527a14f12b"
+ integrity sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==
is-obj@^1.0.0:
version "1.0.1"
- resolved "http://registry.npm.taobao.org/is-obj/download/is-obj-1.0.1.tgz#3e4729ac1f5fde025cd7d83a896dab9f4f67db0f"
-
-is-odd@^2.0.0:
- version "2.0.0"
- resolved "http://registry.npm.taobao.org/is-odd/download/is-odd-2.0.0.tgz#7646624671fd7ea558ccd9a2795182f2958f1b24"
- dependencies:
- is-number "^4.0.0"
+ resolved "https://registry.yarnpkg.com/is-obj/-/is-obj-1.0.1.tgz#3e4729ac1f5fde025cd7d83a896dab9f4f67db0f"
+ integrity sha1-PkcprB9f3gJc19g6iW2rn09n2w8=
-is-path-cwd@^1.0.0:
- version "1.0.0"
- resolved "http://registry.npm.taobao.org/is-path-cwd/download/is-path-cwd-1.0.0.tgz#d225ec23132e89edd38fda767472e62e65f1106d"
+is-path-cwd@^2.0.0:
+ version "2.1.0"
+ resolved "https://registry.yarnpkg.com/is-path-cwd/-/is-path-cwd-2.1.0.tgz#2e0c7e463ff5b7a0eb60852d851a6809347a124c"
+ integrity sha512-Sc5j3/YnM8tDeyCsVeKlm/0p95075DyLmDEIkSgQ7mXkrOX+uTCtmQFm0CYzVyJwcCCmO3k8qfJt17SxQwB5Zw==
-is-path-in-cwd@^1.0.0:
- version "1.0.1"
- resolved "http://registry.npm.taobao.org/is-path-in-cwd/download/is-path-in-cwd-1.0.1.tgz#5ac48b345ef675339bd6c7a48a912110b241cf52"
+is-path-in-cwd@^2.0.0:
+ version "2.1.0"
+ resolved "https://registry.yarnpkg.com/is-path-in-cwd/-/is-path-in-cwd-2.1.0.tgz#bfe2dca26c69f397265a4009963602935a053acb"
+ integrity sha512-rNocXHgipO+rvnP6dk3zI20RpOtrAM/kzbB258Uw5BWr3TpXi861yzjo16Dn4hUox07iw5AyeMLHWsujkjzvRQ==
dependencies:
- is-path-inside "^1.0.0"
+ is-path-inside "^2.1.0"
-is-path-inside@^1.0.0:
- version "1.0.1"
- resolved "http://registry.npm.taobao.org/is-path-inside/download/is-path-inside-1.0.1.tgz#8ef5b7de50437a3fdca6b4e865ef7aa55cb48036"
+is-path-inside@^2.1.0:
+ version "2.1.0"
+ resolved "https://registry.yarnpkg.com/is-path-inside/-/is-path-inside-2.1.0.tgz#7c9810587d659a40d27bcdb4d5616eab059494b2"
+ integrity sha512-wiyhTzfDWsvwAW53OBWF5zuvaOGlZ6PwYxAbPVDhpm+gM09xKQGjBq/8uYN12aDvMxnAnq3dxTyoSoRNmg5YFg==
dependencies:
- path-is-inside "^1.0.1"
+ path-is-inside "^1.0.2"
is-plain-obj@^1.0.0, is-plain-obj@^1.1.0:
version "1.1.0"
- resolved "http://registry.npm.taobao.org/is-plain-obj/download/is-plain-obj-1.1.0.tgz#71a50c8429dfca773c92a390a4a03b39fcd51d3e"
+ resolved "https://registry.yarnpkg.com/is-plain-obj/-/is-plain-obj-1.1.0.tgz#71a50c8429dfca773c92a390a4a03b39fcd51d3e"
+ integrity sha1-caUMhCnfync8kqOQpKA7OfzVHT4=
-is-plain-object@^2.0.1, is-plain-object@^2.0.3, is-plain-object@^2.0.4:
+is-plain-object@^2.0.3, is-plain-object@^2.0.4:
version "2.0.4"
- resolved "http://registry.npm.taobao.org/is-plain-object/download/is-plain-object-2.0.4.tgz#2c163b3fafb1b606d9d17928f05c2a1c38e07677"
+ resolved "https://registry.yarnpkg.com/is-plain-object/-/is-plain-object-2.0.4.tgz#2c163b3fafb1b606d9d17928f05c2a1c38e07677"
+ integrity sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==
dependencies:
isobject "^3.0.1"
-is-posix-bracket@^0.1.0:
- version "0.1.1"
- resolved "http://registry.npm.taobao.org/is-posix-bracket/download/is-posix-bracket-0.1.1.tgz#3334dc79774368e92f016e6fbc0a88f5cd6e6bc4"
-
-is-primitive@^2.0.0:
- version "2.0.0"
- resolved "http://registry.npm.taobao.org/is-primitive/download/is-primitive-2.0.0.tgz#207bab91638499c07b2adf240a41a87210034575"
-
is-promise@^2.1.0:
version "2.1.0"
- resolved "http://registry.npm.taobao.org/is-promise/download/is-promise-2.1.0.tgz#79a2a9ece7f096e80f36d2b2f3bc16c1ff4bf3fa"
-
-is-property@^1.0.0:
- version "1.0.2"
- resolved "http://registry.npm.taobao.org/is-property/download/is-property-1.0.2.tgz#57fe1c4e48474edd65b09911f26b1cd4095dda84"
+ resolved "https://registry.yarnpkg.com/is-promise/-/is-promise-2.1.0.tgz#79a2a9ece7f096e80f36d2b2f3bc16c1ff4bf3fa"
+ integrity sha1-eaKp7OfwlugPNtKy87wWwf9L8/o=
is-regex@^1.0.4:
version "1.0.4"
- resolved "http://registry.npm.taobao.org/is-regex/download/is-regex-1.0.4.tgz#5517489b547091b0930e095654ced25ee97e9491"
+ resolved "https://registry.yarnpkg.com/is-regex/-/is-regex-1.0.4.tgz#5517489b547091b0930e095654ced25ee97e9491"
+ integrity sha1-VRdIm1RwkbCTDglWVM7SXul+lJE=
dependencies:
has "^1.0.1"
[email protected]:
- version "1.0.0"
- resolved "http://registry.npm.taobao.org/is-root/download/is-root-1.0.0.tgz#07b6c233bc394cd9d02ba15c966bd6660d6342d5"
-
-is-stream@^1.0.1, is-stream@^1.1.0:
+is-stream@^1.1.0:
version "1.1.0"
- resolved "http://registry.npm.taobao.org/is-stream/download/is-stream-1.1.0.tgz#12d4a3dd4e68e0b79ceb8dbc84173ae80d91ca44"
-
-is-string@^1.0.4:
- version "1.0.4"
- resolved "http://registry.npm.taobao.org/is-string/download/is-string-1.0.4.tgz#cc3a9b69857d621e963725a24caeec873b826e64"
+ resolved "https://registry.yarnpkg.com/is-stream/-/is-stream-1.1.0.tgz#12d4a3dd4e68e0b79ceb8dbc84173ae80d91ca44"
+ integrity sha1-EtSj3U5o4Lec6428hBc66A2RykQ=
-is-subset@^0.1.1:
- version "0.1.1"
- resolved "http://registry.npm.taobao.org/is-subset/download/is-subset-0.1.1.tgz#8a59117d932de1de00f245fcdd39ce43f1e939a6"
-
-is-svg@^2.0.0:
- version "2.1.0"
- resolved "http://registry.npm.taobao.org/is-svg/download/is-svg-2.1.0.tgz#cf61090da0d9efbcab8722deba6f032208dbb0e9"
+is-symbol@^1.0.2:
+ version "1.0.2"
+ resolved "https://registry.yarnpkg.com/is-symbol/-/is-symbol-1.0.2.tgz#a055f6ae57192caee329e7a860118b497a950f38"
+ integrity sha512-HS8bZ9ox60yCJLH9snBpIwv9pYUAkcuLhSA1oero1UB5y9aiQpRA8y2ex945AOtCZL1lJDeIk3G5LthswI46Lw==
dependencies:
- html-comment-regex "^1.1.0"
-
-is-symbol@^1.0.1:
- version "1.0.1"
- resolved "http://registry.npm.taobao.org/is-symbol/download/is-symbol-1.0.1.tgz#3cc59f00025194b6ab2e38dbae6689256b660572"
+ has-symbols "^1.0.0"
is-text-path@^1.0.0:
version "1.0.1"
- resolved "http://registry.npm.taobao.org/is-text-path/download/is-text-path-1.0.1.tgz#4e1aa0fb51bfbcb3e92688001397202c1775b66e"
+ resolved "https://registry.yarnpkg.com/is-text-path/-/is-text-path-1.0.1.tgz#4e1aa0fb51bfbcb3e92688001397202c1775b66e"
+ integrity sha1-Thqg+1G/vLPpJogAE5cgLBd1tm4=
dependencies:
text-extensions "^1.0.0"
+is-text-path@^2.0.0:
+ version "2.0.0"
+ resolved "https://registry.yarnpkg.com/is-text-path/-/is-text-path-2.0.0.tgz#b2484e2b720a633feb2e85b67dc193ff72c75636"
+ integrity sha512-+oDTluR6WEjdXEJMnC2z6A4FRwFoYuvShVVEGsS7ewc0UTi2QtAKMDJuL4BDEVt+5T7MjFo12RP8ghOM75oKJw==
+ dependencies:
+ text-extensions "^2.0.0"
+
is-typedarray@~1.0.0:
version "1.0.0"
- resolved "http://registry.npm.taobao.org/is-typedarray/download/is-typedarray-1.0.0.tgz#e479c80858df0c1b11ddda6940f96011fcda4a9a"
+ resolved "https://registry.yarnpkg.com/is-typedarray/-/is-typedarray-1.0.0.tgz#e479c80858df0c1b11ddda6940f96011fcda4a9a"
+ integrity sha1-5HnICFjfDBsR3dppQPlgEfzaSpo=
-is-utf8@^0.2.0:
+is-utf8@^0.2.0, is-utf8@^0.2.1:
version "0.2.1"
- resolved "http://registry.npm.taobao.org/is-utf8/download/is-utf8-0.2.1.tgz#4b0da1442104d1b336340e80797e865cf39f7d72"
-
-is-windows@^0.2.0:
- version "0.2.0"
- resolved "http://registry.npm.taobao.org/is-windows/download/is-windows-0.2.0.tgz#de1aa6d63ea29dd248737b69f1ff8b8002d2108c"
+ resolved "https://registry.yarnpkg.com/is-utf8/-/is-utf8-0.2.1.tgz#4b0da1442104d1b336340e80797e865cf39f7d72"
+ integrity sha1-Sw2hRCEE0bM2NA6AeX6GXPOffXI=
is-windows@^1.0.1, is-windows@^1.0.2:
version "1.0.2"
- resolved "http://registry.npm.taobao.org/is-windows/download/is-windows-1.0.2.tgz#d1850eb9791ecd18e6182ce12a30f396634bb19d"
+ resolved "https://registry.yarnpkg.com/is-windows/-/is-windows-1.0.2.tgz#d1850eb9791ecd18e6182ce12a30f396634bb19d"
+ integrity sha512-eXK1UInq2bPmjyX6e3VHIzMLobc4J94i4AWn+Hpq3OU5KkrRC96OAcR3PRJ/pGu6m8TRnBHP9dkXQVsT/COVIA==
is-wsl@^1.1.0:
version "1.1.0"
- resolved "http://registry.npm.taobao.org/is-wsl/download/is-wsl-1.1.0.tgz#1f16e4aa22b04d1336b66188a66af3c600c3a66d"
+ resolved "https://registry.yarnpkg.com/is-wsl/-/is-wsl-1.1.0.tgz#1f16e4aa22b04d1336b66188a66af3c600c3a66d"
+ integrity sha1-HxbkqiKwTRM2tmGIpmrzxgDDpm0=
[email protected]:
version "0.0.1"
- resolved "http://registry.npm.taobao.org/isarray/download/isarray-0.0.1.tgz#8a18acfca9a8f4177e09abfc6038939b05d1eedf"
+ resolved "https://registry.yarnpkg.com/isarray/-/isarray-0.0.1.tgz#8a18acfca9a8f4177e09abfc6038939b05d1eedf"
+ integrity sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8=
[email protected], isarray@^1.0.0, isarray@~1.0.0:
version "1.0.0"
- resolved "http://registry.npm.taobao.org/isarray/download/isarray-1.0.0.tgz#bb935d48582cba168c06834957a54a3e07124f11"
+ resolved "https://registry.yarnpkg.com/isarray/-/isarray-1.0.0.tgz#bb935d48582cba168c06834957a54a3e07124f11"
+ integrity sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=
isexe@^2.0.0:
version "2.0.0"
- resolved "http://registry.npm.taobao.org/isexe/download/isexe-2.0.0.tgz#e8fbf374dc556ff8947a10dcb0572d633f2cfa10"
-
-ismobilejs@^0.5.1:
- version "0.5.1"
- resolved "http://registry.npm.taobao.org/ismobilejs/download/ismobilejs-0.5.1.tgz#0e3f825e29e32f84ad5ddbb60e9e04a894046488"
- integrity sha1-Dj+CXinjL4StXdu2Dp4EqJQEZIg=
+ resolved "https://registry.yarnpkg.com/isexe/-/isexe-2.0.0.tgz#e8fbf374dc556ff8947a10dcb0572d633f2cfa10"
+ integrity sha1-6PvzdNxVb/iUehDcsFctYz8s+hA=
isobject@^2.0.0:
version "2.1.0"
- resolved "http://registry.npm.taobao.org/isobject/download/isobject-2.1.0.tgz#f065561096a3f1da2ef46272f815c840d87e0c89"
+ resolved "https://registry.yarnpkg.com/isobject/-/isobject-2.1.0.tgz#f065561096a3f1da2ef46272f815c840d87e0c89"
+ integrity sha1-8GVWEJaj8dou9GJy+BXIQNh+DIk=
dependencies:
isarray "1.0.0"
isobject@^3.0.0, isobject@^3.0.1:
version "3.0.1"
- resolved "http://registry.npm.taobao.org/isobject/download/isobject-3.0.1.tgz#4e431e92b11a9731636aa1f9c8d1ccbcfdab78df"
-
-isomorphic-fetch@^2.1.1, isomorphic-fetch@^2.2.1:
- version "2.2.1"
- resolved "http://registry.npm.taobao.org/isomorphic-fetch/download/isomorphic-fetch-2.2.1.tgz#611ae1acf14f5e81f729507472819fe9733558a9"
- dependencies:
- node-fetch "^1.0.1"
- whatwg-fetch ">=0.10.0"
+ resolved "https://registry.yarnpkg.com/isobject/-/isobject-3.0.1.tgz#4e431e92b11a9731636aa1f9c8d1ccbcfdab78df"
+ integrity sha1-TkMekrEalzFjaqH5yNHMvP2reN8=
isstream@~0.1.2:
version "0.1.2"
- resolved "http://registry.npm.taobao.org/isstream/download/isstream-0.1.2.tgz#47e63f7af55afa6f92e1500e690eb8b8529c099a"
-
-istanbul-api@^1.1.14:
- version "1.3.1"
- resolved "http://registry.npm.taobao.org/istanbul-api/download/istanbul-api-1.3.1.tgz#4c3b05d18c0016d1022e079b98dc82c40f488954"
- dependencies:
- async "^2.1.4"
- compare-versions "^3.1.0"
- fileset "^2.0.2"
- istanbul-lib-coverage "^1.2.0"
- istanbul-lib-hook "^1.2.0"
- istanbul-lib-instrument "^1.10.1"
- istanbul-lib-report "^1.1.4"
- istanbul-lib-source-maps "^1.2.4"
- istanbul-reports "^1.3.0"
- js-yaml "^3.7.0"
- mkdirp "^0.5.1"
- once "^1.4.0"
-
-istanbul-lib-coverage@^1.1.1, istanbul-lib-coverage@^1.1.2, istanbul-lib-coverage@^1.2.0:
- version "1.2.0"
- resolved "http://registry.npm.taobao.org/istanbul-lib-coverage/download/istanbul-lib-coverage-1.2.0.tgz#f7d8f2e42b97e37fe796114cb0f9d68b5e3a4341"
-
-istanbul-lib-hook@^1.2.0:
- version "1.2.0"
- resolved "http://registry.npm.taobao.org/istanbul-lib-hook/download/istanbul-lib-hook-1.2.0.tgz#ae556fd5a41a6e8efa0b1002b1e416dfeaf9816c"
- dependencies:
- append-transform "^0.4.0"
+ resolved "https://registry.yarnpkg.com/isstream/-/isstream-0.1.2.tgz#47e63f7af55afa6f92e1500e690eb8b8529c099a"
+ integrity sha1-R+Y/evVa+m+S4VAOaQ64uFKcCZo=
-istanbul-lib-instrument@^1.10.1, istanbul-lib-instrument@^1.8.0:
- version "1.10.1"
- resolved "http://registry.npm.taobao.org/istanbul-lib-instrument/download/istanbul-lib-instrument-1.10.1.tgz#724b4b6caceba8692d3f1f9d0727e279c401af7b"
- dependencies:
- babel-generator "^6.18.0"
- babel-template "^6.16.0"
- babel-traverse "^6.18.0"
- babel-types "^6.18.0"
- babylon "^6.18.0"
- istanbul-lib-coverage "^1.2.0"
- semver "^5.3.0"
+istanbul-lib-coverage@^2.0.2, istanbul-lib-coverage@^2.0.5:
+ version "2.0.5"
+ resolved "https://registry.yarnpkg.com/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.5.tgz#675f0ab69503fad4b1d849f736baaca803344f49"
+ integrity sha512-8aXznuEPCJvGnMSRft4udDRDtb1V3pkQkMMI5LI+6HuQz5oQ4J2UFn1H82raA3qJtyOLkkwVqICBQkjnGtn5mA==
-istanbul-lib-report@^1.1.4:
- version "1.1.4"
- resolved "http://registry.npm.taobao.org/istanbul-lib-report/download/istanbul-lib-report-1.1.4.tgz#e886cdf505c4ebbd8e099e4396a90d0a28e2acb5"
+istanbul-lib-instrument@^3.0.1, istanbul-lib-instrument@^3.3.0:
+ version "3.3.0"
+ resolved "https://registry.yarnpkg.com/istanbul-lib-instrument/-/istanbul-lib-instrument-3.3.0.tgz#a5f63d91f0bbc0c3e479ef4c5de027335ec6d630"
+ integrity sha512-5nnIN4vo5xQZHdXno/YDXJ0G+I3dAm4XgzfSVTPLQpj/zAV2dV6Juy0yaf10/zrJOJeHoN3fraFe+XRq2bFVZA==
+ dependencies:
+ "@babel/generator" "^7.4.0"
+ "@babel/parser" "^7.4.3"
+ "@babel/template" "^7.4.0"
+ "@babel/traverse" "^7.4.3"
+ "@babel/types" "^7.4.0"
+ istanbul-lib-coverage "^2.0.5"
+ semver "^6.0.0"
+
+istanbul-lib-report@^2.0.4:
+ version "2.0.8"
+ resolved "https://registry.yarnpkg.com/istanbul-lib-report/-/istanbul-lib-report-2.0.8.tgz#5a8113cd746d43c4889eba36ab10e7d50c9b4f33"
+ integrity sha512-fHBeG573EIihhAblwgxrSenp0Dby6tJMFR/HvlerBsrCTD5bkUuoNtn3gVh29ZCS824cGGBPn7Sg7cNk+2xUsQ==
dependencies:
- istanbul-lib-coverage "^1.2.0"
- mkdirp "^0.5.1"
- path-parse "^1.0.5"
- supports-color "^3.1.2"
+ istanbul-lib-coverage "^2.0.5"
+ make-dir "^2.1.0"
+ supports-color "^6.1.0"
-istanbul-lib-source-maps@^1.2.1:
- version "1.2.3"
- resolved "http://registry.npm.taobao.org/istanbul-lib-source-maps/download/istanbul-lib-source-maps-1.2.3.tgz#20fb54b14e14b3fb6edb6aca3571fd2143db44e6"
+istanbul-lib-source-maps@^3.0.1:
+ version "3.0.6"
+ resolved "https://registry.yarnpkg.com/istanbul-lib-source-maps/-/istanbul-lib-source-maps-3.0.6.tgz#284997c48211752ec486253da97e3879defba8c8"
+ integrity sha512-R47KzMtDJH6X4/YW9XTx+jrLnZnscW4VpNN+1PViSYTejLVPWv7oov+Duf8YQSPyVRUvueQqz1TcsC6mooZTXw==
dependencies:
- debug "^3.1.0"
- istanbul-lib-coverage "^1.1.2"
- mkdirp "^0.5.1"
- rimraf "^2.6.1"
- source-map "^0.5.3"
+ debug "^4.1.1"
+ istanbul-lib-coverage "^2.0.5"
+ make-dir "^2.1.0"
+ rimraf "^2.6.3"
+ source-map "^0.6.1"
-istanbul-lib-source-maps@^1.2.4:
- version "1.2.4"
- resolved "http://registry.npm.taobao.org/istanbul-lib-source-maps/download/istanbul-lib-source-maps-1.2.4.tgz#cc7ccad61629f4efff8e2f78adb8c522c9976ec7"
+istanbul-reports@^2.1.1:
+ version "2.2.6"
+ resolved "https://registry.yarnpkg.com/istanbul-reports/-/istanbul-reports-2.2.6.tgz#7b4f2660d82b29303a8fe6091f8ca4bf058da1af"
+ integrity sha512-SKi4rnMyLBKe0Jy2uUdx28h8oG7ph2PPuQPvIAh31d+Ci+lSiEu4C+h3oBPuJ9+mPKhOyW0M8gY4U5NM1WLeXA==
dependencies:
- debug "^3.1.0"
- istanbul-lib-coverage "^1.2.0"
- mkdirp "^0.5.1"
- rimraf "^2.6.1"
- source-map "^0.5.3"
+ handlebars "^4.1.2"
-istanbul-reports@^1.3.0:
- version "1.3.0"
- resolved "http://registry.npm.taobao.org/istanbul-reports/download/istanbul-reports-1.3.0.tgz#2f322e81e1d9520767597dca3c20a0cce89a3554"
- dependencies:
- handlebars "^4.0.3"
+javascript-stringify@^2.0.0:
+ version "2.0.0"
+ resolved "https://registry.yarnpkg.com/javascript-stringify/-/javascript-stringify-2.0.0.tgz#ef750216ae66504ffd670b68c8b8aa07bdf7b588"
+ integrity sha512-zzK8+ByrzvOL6N92hRewwUKL0wN0TOaIuUjX0Jj8lraxWvr5wHYs2YTjaj2lstF+8qMv5cmPPef47va8NT8lDw==
-jest-changed-files@^22.2.0:
- version "22.4.3"
- resolved "http://registry.npm.taobao.org/jest-changed-files/download/jest-changed-files-22.4.3.tgz#8882181e022c38bd46a2e4d18d44d19d90a90fb2"
+jest-changed-files@^24.8.0:
+ version "24.8.0"
+ resolved "https://registry.yarnpkg.com/jest-changed-files/-/jest-changed-files-24.8.0.tgz#7e7eb21cf687587a85e50f3d249d1327e15b157b"
+ integrity sha512-qgANC1Yrivsq+UrLXsvJefBKVoCsKB0Hv+mBb6NMjjZ90wwxCDmU3hsCXBya30cH+LnPYjwgcU65i6yJ5Nfuug==
dependencies:
+ "@jest/types" "^24.8.0"
+ execa "^1.0.0"
throat "^4.0.0"
-jest-cli@^22.4.4:
- version "22.4.4"
- resolved "http://registry.npm.taobao.org/jest-cli/download/jest-cli-22.4.4.tgz#68cd2a2aae983adb1e6638248ca21082fd6d9e90"
+jest-cli@^24.8.0:
+ version "24.8.0"
+ resolved "https://registry.yarnpkg.com/jest-cli/-/jest-cli-24.8.0.tgz#b075ac914492ed114fa338ade7362a301693e989"
+ integrity sha512-+p6J00jSMPQ116ZLlHJJvdf8wbjNbZdeSX9ptfHX06/MSNaXmKihQzx5vQcw0q2G6JsdVkUIdWbOWtSnaYs3yA==
dependencies:
- ansi-escapes "^3.0.0"
+ "@jest/core" "^24.8.0"
+ "@jest/test-result" "^24.8.0"
+ "@jest/types" "^24.8.0"
chalk "^2.0.1"
exit "^0.1.2"
- glob "^7.1.2"
- graceful-fs "^4.1.11"
- import-local "^1.0.0"
- is-ci "^1.0.10"
- istanbul-api "^1.1.14"
- istanbul-lib-coverage "^1.1.1"
- istanbul-lib-instrument "^1.8.0"
- istanbul-lib-source-maps "^1.2.1"
- jest-changed-files "^22.2.0"
- jest-config "^22.4.4"
- jest-environment-jsdom "^22.4.1"
- jest-get-type "^22.1.0"
- jest-haste-map "^22.4.2"
- jest-message-util "^22.4.0"
- jest-regex-util "^22.1.0"
- jest-resolve-dependencies "^22.1.0"
- jest-runner "^22.4.4"
- jest-runtime "^22.4.4"
- jest-snapshot "^22.4.0"
- jest-util "^22.4.1"
- jest-validate "^22.4.4"
- jest-worker "^22.2.2"
- micromatch "^2.3.11"
- node-notifier "^5.2.1"
- realpath-native "^1.0.0"
- rimraf "^2.5.4"
- slash "^1.0.0"
- string-length "^2.0.0"
- strip-ansi "^4.0.0"
- which "^1.2.12"
- yargs "^10.0.3"
-
-jest-config@^22.4.3, jest-config@^22.4.4:
- version "22.4.4"
- resolved "http://registry.npm.taobao.org/jest-config/download/jest-config-22.4.4.tgz#72a521188720597169cd8b4ff86934ef5752d86a"
- dependencies:
+ import-local "^2.0.0"
+ is-ci "^2.0.0"
+ jest-config "^24.8.0"
+ jest-util "^24.8.0"
+ jest-validate "^24.8.0"
+ prompts "^2.0.1"
+ realpath-native "^1.1.0"
+ yargs "^12.0.2"
+
+jest-config@^24.8.0:
+ version "24.8.0"
+ resolved "https://registry.yarnpkg.com/jest-config/-/jest-config-24.8.0.tgz#77db3d265a6f726294687cbbccc36f8a76ee0f4f"
+ integrity sha512-Czl3Nn2uEzVGsOeaewGWoDPD8GStxCpAe0zOYs2x2l0fZAgPbCr3uwUkgNKV3LwE13VXythM946cd5rdGkkBZw==
+ dependencies:
+ "@babel/core" "^7.1.0"
+ "@jest/test-sequencer" "^24.8.0"
+ "@jest/types" "^24.8.0"
+ babel-jest "^24.8.0"
chalk "^2.0.1"
glob "^7.1.1"
- jest-environment-jsdom "^22.4.1"
- jest-environment-node "^22.4.1"
- jest-get-type "^22.1.0"
- jest-jasmine2 "^22.4.4"
- jest-regex-util "^22.1.0"
- jest-resolve "^22.4.2"
- jest-util "^22.4.1"
- jest-validate "^22.4.4"
- pretty-format "^22.4.0"
-
-jest-diff@^22.4.0, jest-diff@^22.4.3:
- version "22.4.3"
- resolved "http://registry.npm.taobao.org/jest-diff/download/jest-diff-22.4.3.tgz#e18cc3feff0aeef159d02310f2686d4065378030"
+ jest-environment-jsdom "^24.8.0"
+ jest-environment-node "^24.8.0"
+ jest-get-type "^24.8.0"
+ jest-jasmine2 "^24.8.0"
+ jest-regex-util "^24.3.0"
+ jest-resolve "^24.8.0"
+ jest-util "^24.8.0"
+ jest-validate "^24.8.0"
+ micromatch "^3.1.10"
+ pretty-format "^24.8.0"
+ realpath-native "^1.1.0"
+
+jest-diff@^24.8.0:
+ version "24.8.0"
+ resolved "https://registry.yarnpkg.com/jest-diff/-/jest-diff-24.8.0.tgz#146435e7d1e3ffdf293d53ff97e193f1d1546172"
+ integrity sha512-wxetCEl49zUpJ/bvUmIFjd/o52J+yWcoc5ZyPq4/W1LUKGEhRYDIbP1KcF6t+PvqNrGAFk4/JhtxDq/Nnzs66g==
dependencies:
chalk "^2.0.1"
- diff "^3.2.0"
- jest-get-type "^22.4.3"
- pretty-format "^22.4.3"
+ diff-sequences "^24.3.0"
+ jest-get-type "^24.8.0"
+ pretty-format "^24.8.0"
-jest-docblock@^22.4.0, jest-docblock@^22.4.3:
- version "22.4.3"
- resolved "http://registry.npm.taobao.org/jest-docblock/download/jest-docblock-22.4.3.tgz#50886f132b42b280c903c592373bb6e93bb68b19"
+jest-docblock@^24.3.0:
+ version "24.3.0"
+ resolved "https://registry.yarnpkg.com/jest-docblock/-/jest-docblock-24.3.0.tgz#b9c32dac70f72e4464520d2ba4aec02ab14db5dd"
+ integrity sha512-nlANmF9Yq1dufhFlKG9rasfQlrY7wINJbo3q01tu56Jv5eBU5jirylhF2O5ZBnLxzOVBGRDz/9NAwNyBtG4Nyg==
dependencies:
detect-newline "^2.1.0"
-jest-environment-jsdom@^22.4.1:
- version "22.4.3"
- resolved "http://registry.npm.taobao.org/jest-environment-jsdom/download/jest-environment-jsdom-22.4.3.tgz#d67daa4155e33516aecdd35afd82d4abf0fa8a1e"
+jest-each@^24.8.0:
+ version "24.8.0"
+ resolved "https://registry.yarnpkg.com/jest-each/-/jest-each-24.8.0.tgz#a05fd2bf94ddc0b1da66c6d13ec2457f35e52775"
+ integrity sha512-NrwK9gaL5+XgrgoCsd9svsoWdVkK4gnvyhcpzd6m487tXHqIdYeykgq3MKI1u4I+5Zf0tofr70at9dWJDeb+BA==
dependencies:
- jest-mock "^22.4.3"
- jest-util "^22.4.3"
+ "@jest/types" "^24.8.0"
+ chalk "^2.0.1"
+ jest-get-type "^24.8.0"
+ jest-util "^24.8.0"
+ pretty-format "^24.8.0"
+
+jest-environment-jsdom@^24.8.0:
+ version "24.8.0"
+ resolved "https://registry.yarnpkg.com/jest-environment-jsdom/-/jest-environment-jsdom-24.8.0.tgz#300f6949a146cabe1c9357ad9e9ecf9f43f38857"
+ integrity sha512-qbvgLmR7PpwjoFjM/sbuqHJt/NCkviuq9vus9NBn/76hhSidO+Z6Bn9tU8friecegbJL8gzZQEMZBQlFWDCwAQ==
+ dependencies:
+ "@jest/environment" "^24.8.0"
+ "@jest/fake-timers" "^24.8.0"
+ "@jest/types" "^24.8.0"
+ jest-mock "^24.8.0"
+ jest-util "^24.8.0"
jsdom "^11.5.1"
-jest-environment-node@^22.4.1:
- version "22.4.3"
- resolved "http://registry.npm.taobao.org/jest-environment-node/download/jest-environment-node-22.4.3.tgz#54c4eaa374c83dd52a9da8759be14ebe1d0b9129"
- dependencies:
- jest-mock "^22.4.3"
- jest-util "^22.4.3"
-
-jest-fetch-mock@^1.4.0:
- version "1.6.2"
- resolved "http://registry.npm.taobao.org/jest-fetch-mock/download/jest-fetch-mock-1.6.2.tgz#dcdbf137459f0a94fb0a76ec832fed84d3153610"
+jest-environment-node@^24.8.0:
+ version "24.8.0"
+ resolved "https://registry.yarnpkg.com/jest-environment-node/-/jest-environment-node-24.8.0.tgz#d3f726ba8bc53087a60e7a84ca08883a4c892231"
+ integrity sha512-vIGUEScd1cdDgR6sqn2M08sJTRLQp6Dk/eIkCeO4PFHxZMOgy+uYLPMC4ix3PEfM5Au/x3uQ/5Tl0DpXXZsJ/Q==
dependencies:
- isomorphic-fetch "^2.2.1"
- promise-polyfill "^7.1.1"
+ "@jest/environment" "^24.8.0"
+ "@jest/fake-timers" "^24.8.0"
+ "@jest/types" "^24.8.0"
+ jest-mock "^24.8.0"
+ jest-util "^24.8.0"
-jest-get-type@^22.1.0, jest-get-type@^22.4.3:
- version "22.4.3"
- resolved "http://registry.npm.taobao.org/jest-get-type/download/jest-get-type-22.4.3.tgz#e3a8504d8479342dd4420236b322869f18900ce4"
+jest-get-type@^24.8.0:
+ version "24.8.0"
+ resolved "https://registry.yarnpkg.com/jest-get-type/-/jest-get-type-24.8.0.tgz#a7440de30b651f5a70ea3ed7ff073a32dfe646fc"
+ integrity sha512-RR4fo8jEmMD9zSz2nLbs2j0zvPpk/KCEz3a62jJWbd2ayNo0cb+KFRxPHVhE4ZmgGJEQp0fosmNz84IfqM8cMQ==
-jest-haste-map@^22.4.2:
- version "22.4.3"
- resolved "http://registry.npm.taobao.org/jest-haste-map/download/jest-haste-map-22.4.3.tgz#25842fa2ba350200767ac27f658d58b9d5c2e20b"
+jest-haste-map@^24.8.0:
+ version "24.8.1"
+ resolved "https://registry.yarnpkg.com/jest-haste-map/-/jest-haste-map-24.8.1.tgz#f39cc1d2b1d907e014165b4bd5a957afcb992982"
+ integrity sha512-SwaxMGVdAZk3ernAx2Uv2sorA7jm3Kx+lR0grp6rMmnY06Kn/urtKx1LPN2mGTea4fCT38impYT28FfcLUhX0g==
dependencies:
+ "@jest/types" "^24.8.0"
+ anymatch "^2.0.0"
fb-watchman "^2.0.0"
- graceful-fs "^4.1.11"
- jest-docblock "^22.4.3"
- jest-serializer "^22.4.3"
- jest-worker "^22.4.3"
- micromatch "^2.3.11"
- sane "^2.0.0"
+ graceful-fs "^4.1.15"
+ invariant "^2.2.4"
+ jest-serializer "^24.4.0"
+ jest-util "^24.8.0"
+ jest-worker "^24.6.0"
+ micromatch "^3.1.10"
+ sane "^4.0.3"
+ walker "^1.0.7"
+ optionalDependencies:
+ fsevents "^1.2.7"
-jest-jasmine2@^22.4.4:
- version "22.4.4"
- resolved "http://registry.npm.taobao.org/jest-jasmine2/download/jest-jasmine2-22.4.4.tgz#c55f92c961a141f693f869f5f081a79a10d24e23"
+jest-jasmine2@^24.8.0:
+ version "24.8.0"
+ resolved "https://registry.yarnpkg.com/jest-jasmine2/-/jest-jasmine2-24.8.0.tgz#a9c7e14c83dd77d8b15e820549ce8987cc8cd898"
+ integrity sha512-cEky88npEE5LKd5jPpTdDCLvKkdyklnaRycBXL6GNmpxe41F0WN44+i7lpQKa/hcbXaQ+rc9RMaM4dsebrYong==
dependencies:
+ "@babel/traverse" "^7.1.0"
+ "@jest/environment" "^24.8.0"
+ "@jest/test-result" "^24.8.0"
+ "@jest/types" "^24.8.0"
chalk "^2.0.1"
co "^4.6.0"
- expect "^22.4.0"
- graceful-fs "^4.1.11"
- is-generator-fn "^1.0.0"
- jest-diff "^22.4.0"
- jest-matcher-utils "^22.4.0"
- jest-message-util "^22.4.0"
- jest-snapshot "^22.4.0"
- jest-util "^22.4.1"
- source-map-support "^0.5.0"
+ expect "^24.8.0"
+ is-generator-fn "^2.0.0"
+ jest-each "^24.8.0"
+ jest-matcher-utils "^24.8.0"
+ jest-message-util "^24.8.0"
+ jest-runtime "^24.8.0"
+ jest-snapshot "^24.8.0"
+ jest-util "^24.8.0"
+ pretty-format "^24.8.0"
+ throat "^4.0.0"
-jest-leak-detector@^22.4.0:
- version "22.4.3"
- resolved "http://registry.npm.taobao.org/jest-leak-detector/download/jest-leak-detector-22.4.3.tgz#2b7b263103afae8c52b6b91241a2de40117e5b35"
+jest-leak-detector@^24.8.0:
+ version "24.8.0"
+ resolved "https://registry.yarnpkg.com/jest-leak-detector/-/jest-leak-detector-24.8.0.tgz#c0086384e1f650c2d8348095df769f29b48e6980"
+ integrity sha512-cG0yRSK8A831LN8lIHxI3AblB40uhv0z+SsQdW3GoMMVcK+sJwrIIyax5tu3eHHNJ8Fu6IMDpnLda2jhn2pD/g==
dependencies:
- pretty-format "^22.4.3"
+ pretty-format "^24.8.0"
-jest-matcher-utils@^22.4.0, jest-matcher-utils@^22.4.3:
- version "22.4.3"
- resolved "http://registry.npm.taobao.org/jest-matcher-utils/download/jest-matcher-utils-22.4.3.tgz#4632fe428ebc73ebc194d3c7b65d37b161f710ff"
+jest-matcher-utils@^24.8.0:
+ version "24.8.0"
+ resolved "https://registry.yarnpkg.com/jest-matcher-utils/-/jest-matcher-utils-24.8.0.tgz#2bce42204c9af12bde46f83dc839efe8be832495"
+ integrity sha512-lex1yASY51FvUuHgm0GOVj7DCYEouWSlIYmCW7APSqB9v8mXmKSn5+sWVF0MhuASG0bnYY106/49JU1FZNl5hw==
dependencies:
chalk "^2.0.1"
- jest-get-type "^22.4.3"
- pretty-format "^22.4.3"
-
-jest-message-util@^22.4.0, jest-message-util@^22.4.3:
- version "22.4.3"
- resolved "http://registry.npm.taobao.org/jest-message-util/download/jest-message-util-22.4.3.tgz#cf3d38aafe4befddbfc455e57d65d5239e399eb7"
- dependencies:
- "@babel/code-frame" "^7.0.0-beta.35"
+ jest-diff "^24.8.0"
+ jest-get-type "^24.8.0"
+ pretty-format "^24.8.0"
+
+jest-message-util@^24.8.0:
+ version "24.8.0"
+ resolved "https://registry.yarnpkg.com/jest-message-util/-/jest-message-util-24.8.0.tgz#0d6891e72a4beacc0292b638685df42e28d6218b"
+ integrity sha512-p2k71rf/b6ns8btdB0uVdljWo9h0ovpnEe05ZKWceQGfXYr4KkzgKo3PBi8wdnd9OtNh46VpNIJynUn/3MKm1g==
+ dependencies:
+ "@babel/code-frame" "^7.0.0"
+ "@jest/test-result" "^24.8.0"
+ "@jest/types" "^24.8.0"
+ "@types/stack-utils" "^1.0.1"
chalk "^2.0.1"
- micromatch "^2.3.11"
- slash "^1.0.0"
+ micromatch "^3.1.10"
+ slash "^2.0.0"
stack-utils "^1.0.1"
-jest-mock@^22.4.3:
- version "22.4.3"
- resolved "http://registry.npm.taobao.org/jest-mock/download/jest-mock-22.4.3.tgz#f63ba2f07a1511772cdc7979733397df770aabc7"
-
-jest-regex-util@^22.1.0, jest-regex-util@^22.4.3:
- version "22.4.3"
- resolved "http://registry.npm.taobao.org/jest-regex-util/download/jest-regex-util-22.4.3.tgz#a826eb191cdf22502198c5401a1fc04de9cef5af"
-
-jest-resolve-dependencies@^22.1.0:
- version "22.4.3"
- resolved "http://registry.npm.taobao.org/jest-resolve-dependencies/download/jest-resolve-dependencies-22.4.3.tgz#e2256a5a846732dc3969cb72f3c9ad7725a8195e"
+jest-mock@^24.8.0:
+ version "24.8.0"
+ resolved "https://registry.yarnpkg.com/jest-mock/-/jest-mock-24.8.0.tgz#2f9d14d37699e863f1febf4e4d5a33b7fdbbde56"
+ integrity sha512-6kWugwjGjJw+ZkK4mDa0Df3sDlUTsV47MSrT0nGQ0RBWJbpODDQ8MHDVtGtUYBne3IwZUhtB7elxHspU79WH3A==
dependencies:
- jest-regex-util "^22.4.3"
+ "@jest/types" "^24.8.0"
-jest-resolve@^22.4.2:
- version "22.4.3"
- resolved "http://registry.npm.taobao.org/jest-resolve/download/jest-resolve-22.4.3.tgz#0ce9d438c8438229aa9b916968ec6b05c1abb4ea"
- dependencies:
- browser-resolve "^1.11.2"
+jest-pnp-resolver@^1.2.1:
+ version "1.2.1"
+ resolved "https://registry.yarnpkg.com/jest-pnp-resolver/-/jest-pnp-resolver-1.2.1.tgz#ecdae604c077a7fbc70defb6d517c3c1c898923a"
+ integrity sha512-pgFw2tm54fzgYvc/OHrnysABEObZCUNFnhjoRjaVOCN8NYc032/gVjPaHD4Aq6ApkSieWtfKAFQtmDKAmhupnQ==
+
+jest-regex-util@^24.3.0:
+ version "24.3.0"
+ resolved "https://registry.yarnpkg.com/jest-regex-util/-/jest-regex-util-24.3.0.tgz#d5a65f60be1ae3e310d5214a0307581995227b36"
+ integrity sha512-tXQR1NEOyGlfylyEjg1ImtScwMq8Oh3iJbGTjN7p0J23EuVX1MA8rwU69K4sLbCmwzgCUbVkm0FkSF9TdzOhtg==
+
+jest-resolve-dependencies@^24.8.0:
+ version "24.8.0"
+ resolved "https://registry.yarnpkg.com/jest-resolve-dependencies/-/jest-resolve-dependencies-24.8.0.tgz#19eec3241f2045d3f990dba331d0d7526acff8e0"
+ integrity sha512-hyK1qfIf/krV+fSNyhyJeq3elVMhK9Eijlwy+j5jqmZ9QsxwKBiP6qukQxaHtK8k6zql/KYWwCTQ+fDGTIJauw==
+ dependencies:
+ "@jest/types" "^24.8.0"
+ jest-regex-util "^24.3.0"
+ jest-snapshot "^24.8.0"
+
+jest-resolve@^24.8.0:
+ version "24.8.0"
+ resolved "https://registry.yarnpkg.com/jest-resolve/-/jest-resolve-24.8.0.tgz#84b8e5408c1f6a11539793e2b5feb1b6e722439f"
+ integrity sha512-+hjSzi1PoRvnuOICoYd5V/KpIQmkAsfjFO71458hQ2Whi/yf1GDeBOFj8Gxw4LrApHsVJvn5fmjcPdmoUHaVKw==
+ dependencies:
+ "@jest/types" "^24.8.0"
+ browser-resolve "^1.11.3"
chalk "^2.0.1"
-
-jest-runner@^22.4.4:
- version "22.4.4"
- resolved "http://registry.npm.taobao.org/jest-runner/download/jest-runner-22.4.4.tgz#dfca7b7553e0fa617e7b1291aeb7ce83e540a907"
- dependencies:
+ jest-pnp-resolver "^1.2.1"
+ realpath-native "^1.1.0"
+
+jest-runner@^24.8.0:
+ version "24.8.0"
+ resolved "https://registry.yarnpkg.com/jest-runner/-/jest-runner-24.8.0.tgz#4f9ae07b767db27b740d7deffad0cf67ccb4c5bb"
+ integrity sha512-utFqC5BaA3JmznbissSs95X1ZF+d+4WuOWwpM9+Ak356YtMhHE/GXUondZdcyAAOTBEsRGAgH/0TwLzfI9h7ow==
+ dependencies:
+ "@jest/console" "^24.7.1"
+ "@jest/environment" "^24.8.0"
+ "@jest/test-result" "^24.8.0"
+ "@jest/types" "^24.8.0"
+ chalk "^2.4.2"
exit "^0.1.2"
- jest-config "^22.4.4"
- jest-docblock "^22.4.0"
- jest-haste-map "^22.4.2"
- jest-jasmine2 "^22.4.4"
- jest-leak-detector "^22.4.0"
- jest-message-util "^22.4.0"
- jest-runtime "^22.4.4"
- jest-util "^22.4.1"
- jest-worker "^22.2.2"
+ graceful-fs "^4.1.15"
+ jest-config "^24.8.0"
+ jest-docblock "^24.3.0"
+ jest-haste-map "^24.8.0"
+ jest-jasmine2 "^24.8.0"
+ jest-leak-detector "^24.8.0"
+ jest-message-util "^24.8.0"
+ jest-resolve "^24.8.0"
+ jest-runtime "^24.8.0"
+ jest-util "^24.8.0"
+ jest-worker "^24.6.0"
+ source-map-support "^0.5.6"
throat "^4.0.0"
-jest-runtime@^22.4.4:
- version "22.4.4"
- resolved "http://registry.npm.taobao.org/jest-runtime/download/jest-runtime-22.4.4.tgz#9ba7792fc75582a5be0f79af6f8fe8adea314048"
- dependencies:
- babel-core "^6.0.0"
- babel-jest "^22.4.4"
- babel-plugin-istanbul "^4.1.5"
+jest-runtime@^24.8.0:
+ version "24.8.0"
+ resolved "https://registry.yarnpkg.com/jest-runtime/-/jest-runtime-24.8.0.tgz#05f94d5b05c21f6dc54e427cd2e4980923350620"
+ integrity sha512-Mq0aIXhvO/3bX44ccT+czU1/57IgOMyy80oM0XR/nyD5zgBcesF84BPabZi39pJVA6UXw+fY2Q1N+4BiVUBWOA==
+ dependencies:
+ "@jest/console" "^24.7.1"
+ "@jest/environment" "^24.8.0"
+ "@jest/source-map" "^24.3.0"
+ "@jest/transform" "^24.8.0"
+ "@jest/types" "^24.8.0"
+ "@types/yargs" "^12.0.2"
chalk "^2.0.1"
- convert-source-map "^1.4.0"
exit "^0.1.2"
- graceful-fs "^4.1.11"
- jest-config "^22.4.4"
- jest-haste-map "^22.4.2"
- jest-regex-util "^22.1.0"
- jest-resolve "^22.4.2"
- jest-util "^22.4.1"
- jest-validate "^22.4.4"
- json-stable-stringify "^1.0.1"
- micromatch "^2.3.11"
- realpath-native "^1.0.0"
- slash "^1.0.0"
- strip-bom "3.0.0"
- write-file-atomic "^2.1.0"
- yargs "^10.0.3"
+ glob "^7.1.3"
+ graceful-fs "^4.1.15"
+ jest-config "^24.8.0"
+ jest-haste-map "^24.8.0"
+ jest-message-util "^24.8.0"
+ jest-mock "^24.8.0"
+ jest-regex-util "^24.3.0"
+ jest-resolve "^24.8.0"
+ jest-snapshot "^24.8.0"
+ jest-util "^24.8.0"
+ jest-validate "^24.8.0"
+ realpath-native "^1.1.0"
+ slash "^2.0.0"
+ strip-bom "^3.0.0"
+ yargs "^12.0.2"
-jest-serializer@^22.4.3:
- version "22.4.3"
- resolved "http://registry.npm.taobao.org/jest-serializer/download/jest-serializer-22.4.3.tgz#a679b81a7f111e4766235f4f0c46d230ee0f7436"
+jest-serializer@^24.4.0:
+ version "24.4.0"
+ resolved "https://registry.yarnpkg.com/jest-serializer/-/jest-serializer-24.4.0.tgz#f70c5918c8ea9235ccb1276d232e459080588db3"
+ integrity sha512-k//0DtglVstc1fv+GY/VHDIjrtNjdYvYjMlbLUed4kxrE92sIUewOi5Hj3vrpB8CXfkJntRPDRjCrCvUhBdL8Q==
-jest-snapshot@^22.4.0:
- version "22.4.3"
- resolved "http://registry.npm.taobao.org/jest-snapshot/download/jest-snapshot-22.4.3.tgz#b5c9b42846ffb9faccb76b841315ba67887362d2"
+jest-snapshot@^24.8.0:
+ version "24.8.0"
+ resolved "https://registry.yarnpkg.com/jest-snapshot/-/jest-snapshot-24.8.0.tgz#3bec6a59da2ff7bc7d097a853fb67f9d415cb7c6"
+ integrity sha512-5ehtWoc8oU9/cAPe6fez6QofVJLBKyqkY2+TlKTOf0VllBB/mqUNdARdcjlZrs9F1Cv+/HKoCS/BknT0+tmfPg==
dependencies:
+ "@babel/types" "^7.0.0"
+ "@jest/types" "^24.8.0"
chalk "^2.0.1"
- jest-diff "^22.4.3"
- jest-matcher-utils "^22.4.3"
+ expect "^24.8.0"
+ jest-diff "^24.8.0"
+ jest-matcher-utils "^24.8.0"
+ jest-message-util "^24.8.0"
+ jest-resolve "^24.8.0"
mkdirp "^0.5.1"
natural-compare "^1.4.0"
- pretty-format "^22.4.3"
+ pretty-format "^24.8.0"
+ semver "^5.5.0"
-jest-util@^22.4.1, jest-util@^22.4.3:
- version "22.4.3"
- resolved "http://registry.npm.taobao.org/jest-util/download/jest-util-22.4.3.tgz#c70fec8eec487c37b10b0809dc064a7ecf6aafac"
- dependencies:
- callsites "^2.0.0"
+jest-util@^24.8.0:
+ version "24.8.0"
+ resolved "https://registry.yarnpkg.com/jest-util/-/jest-util-24.8.0.tgz#41f0e945da11df44cc76d64ffb915d0716f46cd1"
+ integrity sha512-DYZeE+XyAnbNt0BG1OQqKy/4GVLPtzwGx5tsnDrFcax36rVE3lTA5fbvgmbVPUZf9w77AJ8otqR4VBbfFJkUZA==
+ dependencies:
+ "@jest/console" "^24.7.1"
+ "@jest/fake-timers" "^24.8.0"
+ "@jest/source-map" "^24.3.0"
+ "@jest/test-result" "^24.8.0"
+ "@jest/types" "^24.8.0"
+ callsites "^3.0.0"
chalk "^2.0.1"
- graceful-fs "^4.1.11"
- is-ci "^1.0.10"
- jest-message-util "^22.4.3"
+ graceful-fs "^4.1.15"
+ is-ci "^2.0.0"
mkdirp "^0.5.1"
+ slash "^2.0.0"
source-map "^0.6.0"
-jest-validate@^22.4.4:
- version "22.4.4"
- resolved "http://registry.npm.taobao.org/jest-validate/download/jest-validate-22.4.4.tgz#1dd0b616ef46c995de61810d85f57119dbbcec4d"
+jest-validate@^24.8.0:
+ version "24.8.0"
+ resolved "https://registry.yarnpkg.com/jest-validate/-/jest-validate-24.8.0.tgz#624c41533e6dfe356ffadc6e2423a35c2d3b4849"
+ integrity sha512-+/N7VOEMW1Vzsrk3UWBDYTExTPwf68tavEPKDnJzrC6UlHtUDU/fuEdXqFoHzv9XnQ+zW6X3qMZhJ3YexfeLDA==
dependencies:
+ "@jest/types" "^24.8.0"
+ camelcase "^5.0.0"
chalk "^2.0.1"
- jest-config "^22.4.4"
- jest-get-type "^22.1.0"
+ jest-get-type "^24.8.0"
leven "^2.1.0"
- pretty-format "^22.4.0"
+ pretty-format "^24.8.0"
+
+jest-watcher@^24.8.0:
+ version "24.8.0"
+ resolved "https://registry.yarnpkg.com/jest-watcher/-/jest-watcher-24.8.0.tgz#58d49915ceddd2de85e238f6213cef1c93715de4"
+ integrity sha512-SBjwHt5NedQoVu54M5GEx7cl7IGEFFznvd/HNT8ier7cCAx/Qgu9ZMlaTQkvK22G1YOpcWBLQPFSImmxdn3DAw==
+ dependencies:
+ "@jest/test-result" "^24.8.0"
+ "@jest/types" "^24.8.0"
+ "@types/yargs" "^12.0.9"
+ ansi-escapes "^3.0.0"
+ chalk "^2.0.1"
+ jest-util "^24.8.0"
+ string-length "^2.0.0"
-jest-worker@^22.2.2, jest-worker@^22.4.3:
- version "22.4.3"
- resolved "http://registry.npm.taobao.org/jest-worker/download/jest-worker-22.4.3.tgz#5c421417cba1c0abf64bf56bd5fb7968d79dd40b"
+jest-worker@^24.6.0:
+ version "24.6.0"
+ resolved "https://registry.yarnpkg.com/jest-worker/-/jest-worker-24.6.0.tgz#7f81ceae34b7cde0c9827a6980c35b7cdc0161b3"
+ integrity sha512-jDwgW5W9qGNvpI1tNnvajh0a5IE/PuGLFmHk6aR/BZFz8tSgGw17GsDPXAJ6p91IvYDjOw8GpFbvvZGAK+DPQQ==
dependencies:
merge-stream "^1.0.1"
+ supports-color "^6.1.0"
-jest@^22.0.6:
- version "22.4.4"
- resolved "http://registry.npm.taobao.org/jest/download/jest-22.4.4.tgz#ffb36c9654b339a13e10b3d4b338eb3e9d49f6eb"
+jest@^24.8.0:
+ version "24.8.0"
+ resolved "https://registry.yarnpkg.com/jest/-/jest-24.8.0.tgz#d5dff1984d0d1002196e9b7f12f75af1b2809081"
+ integrity sha512-o0HM90RKFRNWmAWvlyV8i5jGZ97pFwkeVoGvPW1EtLTgJc2+jcuqcbbqcSZLE/3f2S5pt0y2ZBETuhpWNl1Reg==
dependencies:
- import-local "^1.0.0"
- jest-cli "^22.4.4"
+ import-local "^2.0.0"
+ jest-cli "^24.8.0"
-js-base64@^2.1.8, js-base64@^2.1.9:
- version "2.4.5"
- resolved "http://registry.npm.taobao.org/js-base64/download/js-base64-2.4.5.tgz#e293cd3c7c82f070d700fc7a1ca0a2e69f101f92"
+js-levenshtein@^1.1.3:
+ version "1.1.6"
+ resolved "https://registry.yarnpkg.com/js-levenshtein/-/js-levenshtein-1.1.6.tgz#c6cee58eb3550372df8deb85fad5ce66ce01d59d"
+ integrity sha512-X2BB11YZtrRqY4EnQcLX5Rh373zbK4alC1FW7D7MBhL2gtcC17cTnr6DmfHZeS0s2rTHjUTMMHfG7gO8SSdw+g==
-js-tokens@^3.0.0, js-tokens@^3.0.2:
- version "3.0.2"
- resolved "http://registry.npm.taobao.org/js-tokens/download/js-tokens-3.0.2.tgz#9866df395102130e38f7f996bceb65443209c25b"
+"js-tokens@^3.0.0 || ^4.0.0", js-tokens@^4.0.0:
+ version "4.0.0"
+ resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-4.0.0.tgz#19203fb59991df98e3a287050d4647cdeaf32499"
+ integrity sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==
-js-yaml@^3.4.3, js-yaml@^3.7.0, js-yaml@^3.9.0:
- version "3.11.0"
- resolved "http://registry.npm.taobao.org/js-yaml/download/js-yaml-3.11.0.tgz#597c1a8bd57152f26d622ce4117851a51f5ebaef"
+js-yaml@^3.13.1:
+ version "3.13.1"
+ resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.13.1.tgz#aff151b30bfdfa8e49e05da22e7415e9dfa37847"
+ integrity sha512-YfbcO7jXDdyj0DGxYVSlSeQNHbD7XPWvrVWeVUujrQEoZzWJIRrCPoyk6kL6IAjAG2IolMK4T0hNUe0HOUs5Jw==
dependencies:
argparse "^1.0.7"
esprima "^4.0.0"
-js-yaml@~3.7.0:
- version "3.7.0"
- resolved "http://registry.npm.taobao.org/js-yaml/download/js-yaml-3.7.0.tgz#5c967ddd837a9bfdca5f2de84253abe8a1c03b80"
- dependencies:
- argparse "^1.0.7"
- esprima "^2.6.0"
-
jsbn@~0.1.0:
version "0.1.1"
- resolved "http://registry.npm.taobao.org/jsbn/download/jsbn-0.1.1.tgz#a5e654c2e5a2deb5f201d96cefbca80c0ef2f513"
-
-jsconfig-paths-webpack-plugin@^0.1.3:
- version "0.1.3"
- resolved "http://registry.npm.taobao.org/jsconfig-paths-webpack-plugin/download/jsconfig-paths-webpack-plugin-0.1.3.tgz#fdeb718b7dc39cd4fa89c6df76015428ba4a51b8"
- dependencies:
- path "^0.12.7"
+ resolved "https://registry.yarnpkg.com/jsbn/-/jsbn-0.1.1.tgz#a5e654c2e5a2deb5f201d96cefbca80c0ef2f513"
+ integrity sha1-peZUwuWi3rXyAdls77yoDA7y9RM=
jsdom@^11.5.1:
- version "11.11.0"
- resolved "http://registry.npm.taobao.org/jsdom/download/jsdom-11.11.0.tgz#df486efad41aee96c59ad7a190e2449c7eb1110e"
+ version "11.12.0"
+ resolved "https://registry.yarnpkg.com/jsdom/-/jsdom-11.12.0.tgz#1a80d40ddd378a1de59656e9e6dc5a3ba8657bc8"
+ integrity sha512-y8Px43oyiBM13Zc1z780FrfNLJCXTL40EWlty/LXUtcjykRBNgLlCjWXpfSPBl2iv+N7koQN+dvqszHZgT/Fjw==
dependencies:
- abab "^1.0.4"
- acorn "^5.3.0"
+ abab "^2.0.0"
+ acorn "^5.5.3"
acorn-globals "^4.1.0"
array-equal "^1.0.0"
cssom ">= 0.3.2 < 0.4.0"
- cssstyle ">= 0.3.1 < 0.4.0"
+ cssstyle "^1.0.0"
data-urls "^1.0.0"
- domexception "^1.0.0"
- escodegen "^1.9.0"
+ domexception "^1.0.1"
+ escodegen "^1.9.1"
html-encoding-sniffer "^1.0.2"
- left-pad "^1.2.0"
- nwsapi "^2.0.0"
+ left-pad "^1.3.0"
+ nwsapi "^2.0.7"
parse5 "4.0.0"
pn "^1.1.0"
- request "^2.83.0"
+ request "^2.87.0"
request-promise-native "^1.0.5"
sax "^1.2.4"
symbol-tree "^3.2.2"
- tough-cookie "^2.3.3"
+ tough-cookie "^2.3.4"
w3c-hr-time "^1.0.1"
webidl-conversions "^4.0.2"
whatwg-encoding "^1.0.3"
whatwg-mimetype "^2.1.0"
whatwg-url "^6.4.1"
- ws "^4.0.0"
+ ws "^5.2.0"
xml-name-validator "^3.0.0"
-jsesc@^1.3.0:
- version "1.3.0"
- resolved "http://registry.npm.taobao.org/jsesc/download/jsesc-1.3.0.tgz#46c3fec8c1892b12b0833db9bc7622176dbab34b"
+jsesc@^2.5.1:
+ version "2.5.2"
+ resolved "https://registry.yarnpkg.com/jsesc/-/jsesc-2.5.2.tgz#80564d2e483dacf6e8ef209650a67df3f0c283a4"
+ integrity sha512-OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA==
jsesc@~0.5.0:
version "0.5.0"
- resolved "http://registry.npm.taobao.org/jsesc/download/jsesc-0.5.0.tgz#e7dee66e35d6fc16f710fe91d5cf69f70f08911d"
-
-json-loader@^0.5.4:
- version "0.5.7"
- resolved "http://registry.npm.taobao.org/json-loader/download/json-loader-0.5.7.tgz#dca14a70235ff82f0ac9a3abeb60d337a365185d"
+ resolved "https://registry.yarnpkg.com/jsesc/-/jsesc-0.5.0.tgz#e7dee66e35d6fc16f710fe91d5cf69f70f08911d"
+ integrity sha1-597mbjXW/Bb3EP6R1c9p9w8IkR0=
-json-parse-better-errors@^1.0.1:
+json-parse-better-errors@^1.0.1, json-parse-better-errors@^1.0.2:
version "1.0.2"
- resolved "http://registry.npm.taobao.org/json-parse-better-errors/download/json-parse-better-errors-1.0.2.tgz#bb867cfb3450e69107c131d1c514bab3dc8bcaa9"
+ resolved "https://registry.yarnpkg.com/json-parse-better-errors/-/json-parse-better-errors-1.0.2.tgz#bb867cfb3450e69107c131d1c514bab3dc8bcaa9"
+ integrity sha512-mrqyZKfX5EhL7hvqcV6WG1yYjnjeuYDzDhhcAAUrq8Po85NBQBJP+ZDUT75qZQ98IkUoBqdkExkukOU7Ts2wrw==
-json-schema-traverse@^0.3.0:
- version "0.3.1"
- resolved "http://registry.npm.taobao.org/json-schema-traverse/download/json-schema-traverse-0.3.1.tgz#349a6d44c53a51de89b40805c5d5e59b417d3340"
+json-schema-traverse@^0.4.1:
+ version "0.4.1"
+ resolved "https://registry.yarnpkg.com/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz#69f6a87d9513ab8bb8fe63bdb0979c448e684660"
+ integrity sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==
[email protected]:
version "0.2.3"
- resolved "http://registry.npm.taobao.org/json-schema/download/json-schema-0.2.3.tgz#b480c892e59a2f05954ce727bd3f2a4e882f9e13"
+ resolved "https://registry.yarnpkg.com/json-schema/-/json-schema-0.2.3.tgz#b480c892e59a2f05954ce727bd3f2a4e882f9e13"
+ integrity sha1-tIDIkuWaLwWVTOcnvT8qTogvnhM=
-json-stable-stringify@^1.0.1:
+json-stable-stringify-without-jsonify@^1.0.1:
version "1.0.1"
- resolved "http://registry.npm.taobao.org/json-stable-stringify/download/json-stable-stringify-1.0.1.tgz#9a759d39c5f2ff503fd5300646ed445f88c4f9af"
- dependencies:
- jsonify "~0.0.0"
+ resolved "https://registry.yarnpkg.com/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz#9db7b59496ad3f3cfef30a75142d2d930ad72651"
+ integrity sha1-nbe1lJatPzz+8wp1FC0tkwrXJlE=
json-stringify-safe@^5.0.1, json-stringify-safe@~5.0.1:
version "5.0.1"
- resolved "http://registry.npm.taobao.org/json-stringify-safe/download/json-stringify-safe-5.0.1.tgz#1296a2d58fd45f19a0f6ce01d65701e2c735b6eb"
-
-json2mq@^0.2.0:
- version "0.2.0"
- resolved "http://registry.npm.taobao.org/json2mq/download/json2mq-0.2.0.tgz#b637bd3ba9eabe122c83e9720483aeb10d2c904a"
- dependencies:
- string-convert "^0.2.0"
+ resolved "https://registry.yarnpkg.com/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz#1296a2d58fd45f19a0f6ce01d65701e2c735b6eb"
+ integrity sha1-Epai1Y/UXxmg9s4B1lcB4sc1tus=
json3@^3.3.2:
- version "3.3.2"
- resolved "http://registry.npm.taobao.org/json3/download/json3-3.3.2.tgz#3c0434743df93e2f5c42aee7b19bcb483575f4e1"
+ version "3.3.3"
+ resolved "https://registry.yarnpkg.com/json3/-/json3-3.3.3.tgz#7fc10e375fc5ae42c4705a5cc0aa6f62be305b81"
+ integrity sha512-c7/8mbUsKigAbLkD5B010BK4D9LZm7A1pNItkEwiUZRpIN66exu/e7YQWysGun+TRKaJp8MhemM+VkfWv42aCA==
-json5@^0.5.0, json5@^0.5.1:
- version "0.5.1"
- resolved "http://registry.npm.taobao.org/json5/download/json5-0.5.1.tgz#1eade7acc012034ad84e2396767ead9fa5495821"
+json5@^1.0.1:
+ version "1.0.1"
+ resolved "https://registry.yarnpkg.com/json5/-/json5-1.0.1.tgz#779fb0018604fa854eacbf6252180d83543e3dbe"
+ integrity sha512-aKS4WQjPenRxiQsC93MNfjx+nbF4PAdYzmd/1JIj8HYzqfbu86beTuNgXDzPknWk0n0uARlyewZo4s++ES36Ow==
+ dependencies:
+ minimist "^1.2.0"
-jsonfile@^2.1.0:
- version "2.4.0"
- resolved "http://registry.npm.taobao.org/jsonfile/download/jsonfile-2.4.0.tgz#3736a2b428b87bbda0cc83b53fa3d633a35c2ae8"
- optionalDependencies:
- graceful-fs "^4.1.6"
+json5@^2.1.0:
+ version "2.1.0"
+ resolved "https://registry.yarnpkg.com/json5/-/json5-2.1.0.tgz#e7a0c62c48285c628d20a10b85c89bb807c32850"
+ integrity sha512-8Mh9h6xViijj36g7Dxi+Y4S6hNGV96vcJZr/SrlHh1LR/pEn/8j/+qIBbs44YKl69Lrfctp4QD+AdWLTMqEZAQ==
+ dependencies:
+ minimist "^1.2.0"
jsonfile@^4.0.0:
version "4.0.0"
- resolved "http://registry.npm.taobao.org/jsonfile/download/jsonfile-4.0.0.tgz#8771aae0799b64076b76640fca058f9c10e33ecb"
+ resolved "https://registry.yarnpkg.com/jsonfile/-/jsonfile-4.0.0.tgz#8771aae0799b64076b76640fca058f9c10e33ecb"
+ integrity sha1-h3Gq4HmbZAdrdmQPygWPnBDjPss=
optionalDependencies:
graceful-fs "^4.1.6"
-jsonify@~0.0.0:
- version "0.0.0"
- resolved "http://registry.npm.taobao.org/jsonify/download/jsonify-0.0.0.tgz#2c74b6ee41d93ca51b7b5aaee8f503631d252a73"
-
jsonparse@^1.2.0:
version "1.3.1"
- resolved "http://registry.npm.taobao.org/jsonparse/download/jsonparse-1.3.1.tgz#3f4dae4a91fac315f71062f8521cc239f1366280"
-
-jsonpointer@^4.0.0:
- version "4.0.1"
- resolved "http://registry.npm.taobao.org/jsonpointer/download/jsonpointer-4.0.1.tgz#4fd92cb34e0e9db3c89c8622ecf51f9b978c6cb9"
+ resolved "https://registry.yarnpkg.com/jsonparse/-/jsonparse-1.3.1.tgz#3f4dae4a91fac315f71062f8521cc239f1366280"
+ integrity sha1-P02uSpH6wxX3EGL4UhzCOfE2YoA=
jsprim@^1.2.2:
version "1.4.1"
- resolved "http://registry.npm.taobao.org/jsprim/download/jsprim-1.4.1.tgz#313e66bc1e5cc06e438bc1b7499c2e5c56acb6a2"
+ resolved "https://registry.yarnpkg.com/jsprim/-/jsprim-1.4.1.tgz#313e66bc1e5cc06e438bc1b7499c2e5c56acb6a2"
+ integrity sha1-MT5mvB5cwG5Di8G3SZwuXFastqI=
dependencies:
assert-plus "1.0.0"
extsprintf "1.3.0"
json-schema "0.2.3"
verror "1.10.0"
-just-extend@^1.1.27:
- version "1.1.27"
- resolved "http://registry.npm.taobao.org/just-extend/download/just-extend-1.1.27.tgz#ec6e79410ff914e472652abfa0e603c03d60e905"
+jsx-ast-utils@^2.1.0:
+ version "2.2.1"
+ resolved "https://registry.yarnpkg.com/jsx-ast-utils/-/jsx-ast-utils-2.2.1.tgz#4d4973ebf8b9d2837ee91a8208cc66f3a2776cfb"
+ integrity sha512-v3FxCcAf20DayI+uxnCuw795+oOIkVu6EnJ1+kSzhqqTZHNkTZ7B66ZgLp4oLJ/gbA64cI0B7WRoHZMSRdyVRQ==
+ dependencies:
+ array-includes "^3.0.3"
+ object.assign "^4.1.0"
+
+just-extend@^4.0.2:
+ version "4.0.2"
+ resolved "https://registry.yarnpkg.com/just-extend/-/just-extend-4.0.2.tgz#f3f47f7dfca0f989c55410a7ebc8854b07108afc"
+ integrity sha512-FrLwOgm+iXrPV+5zDU6Jqu4gCRXbWEQg2O3SKONsWE4w7AXFRkryS53bpWdaL9cNol+AmR3AEYz6kn+o0fCPnw==
-killable@^1.0.0:
- version "1.0.0"
- resolved "http://registry.npm.taobao.org/killable/download/killable-1.0.0.tgz#da8b84bd47de5395878f95d64d02f2449fe05e6b"
+killable@^1.0.1:
+ version "1.0.1"
+ resolved "https://registry.yarnpkg.com/killable/-/killable-1.0.1.tgz#4c8ce441187a061c7474fb87ca08e2a638194892"
+ integrity sha512-LzqtLKlUwirEUyl/nicirVmNiPvYs7l5n8wOPP7fyJVpUPkvCnW/vuiXGpylGUlnPDnB7311rARzAt3Mhswpjg==
kind-of@^3.0.2, kind-of@^3.0.3, kind-of@^3.2.0:
version "3.2.2"
- resolved "http://registry.npm.taobao.org/kind-of/download/kind-of-3.2.2.tgz#31ea21a734bab9bbb0f32466d893aea51e4a3c64"
+ resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-3.2.2.tgz#31ea21a734bab9bbb0f32466d893aea51e4a3c64"
+ integrity sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=
dependencies:
is-buffer "^1.1.5"
kind-of@^4.0.0:
version "4.0.0"
- resolved "http://registry.npm.taobao.org/kind-of/download/kind-of-4.0.0.tgz#20813df3d712928b207378691a45066fae72dd57"
+ resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-4.0.0.tgz#20813df3d712928b207378691a45066fae72dd57"
+ integrity sha1-IIE989cSkosgc3hpGkUGb65y3Vc=
dependencies:
is-buffer "^1.1.5"
kind-of@^5.0.0:
version "5.1.0"
- resolved "http://registry.npm.taobao.org/kind-of/download/kind-of-5.1.0.tgz#729c91e2d857b7a419a1f9aa65685c4c33f5845d"
+ resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-5.1.0.tgz#729c91e2d857b7a419a1f9aa65685c4c33f5845d"
+ integrity sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==
kind-of@^6.0.0, kind-of@^6.0.2:
version "6.0.2"
- resolved "http://registry.npm.taobao.org/kind-of/download/kind-of-6.0.2.tgz#01146b36a6218e64e58f3a8d66de5d7fc6f6d051"
-
-klaw@^1.0.0:
- version "1.3.1"
- resolved "http://registry.npm.taobao.org/klaw/download/klaw-1.3.1.tgz#4088433b46b3b1ba259d78785d8e96f73ba02439"
- optionalDependencies:
- graceful-fs "^4.1.9"
+ resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-6.0.2.tgz#01146b36a6218e64e58f3a8d66de5d7fc6f6d051"
+ integrity sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==
-lazy-cache@^1.0.3:
- version "1.0.4"
- resolved "http://registry.npm.taobao.org/lazy-cache/download/lazy-cache-1.0.4.tgz#a1d78fc3a50474cb80845d3b3b6e1da49a446e8e"
+kleur@^3.0.2:
+ version "3.0.3"
+ resolved "https://registry.yarnpkg.com/kleur/-/kleur-3.0.3.tgz#a79c9ecc86ee1ce3fa6206d1216c501f147fc07e"
+ integrity sha512-eTIzlVOSUR+JxdDFepEYcBMtZ9Qqdef+rnzWdRZuMbOywu5tO2w2N7rqjoANZ5k9vywhL6Br1VRjUIgTQx4E8w==
lazystream@^1.0.0:
version "1.0.0"
- resolved "http://registry.npm.taobao.org/lazystream/download/lazystream-1.0.0.tgz#f6995fe0f820392f61396be89462407bb77168e4"
+ resolved "https://registry.yarnpkg.com/lazystream/-/lazystream-1.0.0.tgz#f6995fe0f820392f61396be89462407bb77168e4"
+ integrity sha1-9plf4PggOS9hOWvolGJAe7dxaOQ=
dependencies:
readable-stream "^2.0.5"
-lcid@^1.0.0:
- version "1.0.0"
- resolved "http://registry.npm.taobao.org/lcid/download/lcid-1.0.0.tgz#308accafa0bc483a3867b4b6f2b9506251d1b835"
+lcid@^2.0.0:
+ version "2.0.0"
+ resolved "https://registry.yarnpkg.com/lcid/-/lcid-2.0.0.tgz#6ef5d2df60e52f82eb228a4c373e8d1f397253cf"
+ integrity sha512-avPEb8P8EGnwXKClwsNUgryVjllcRqtMYa49NTsbQagYuT1DcXnl1915oxWjoyGrXR6zH/Y0Zc96xWsPcoDKeA==
dependencies:
- invert-kv "^1.0.0"
+ invert-kv "^2.0.0"
-left-pad@^1.2.0:
+left-pad@^1.3.0:
version "1.3.0"
- resolved "http://registry.npm.taobao.org/left-pad/download/left-pad-1.3.0.tgz#5b8a3a7765dfe001261dde915589e782f8c94d1e"
+ resolved "https://registry.yarnpkg.com/left-pad/-/left-pad-1.3.0.tgz#5b8a3a7765dfe001261dde915589e782f8c94d1e"
+ integrity sha512-XI5MPzVNApjAyhQzphX8BkmKsKUxD4LdyK24iZeQGinBN9yTQT3bFlCBy/aVx2HrNcqQGsdot8ghrjyrvMCoEA==
leven@^2.1.0:
version "2.1.0"
- resolved "http://registry.npm.taobao.org/leven/download/leven-2.1.0.tgz#c2e7a9f772094dee9d34202ae8acce4687875580"
+ resolved "https://registry.yarnpkg.com/leven/-/leven-2.1.0.tgz#c2e7a9f772094dee9d34202ae8acce4687875580"
+ integrity sha1-wuep93IJTe6dNCAq6KzORoeHVYA=
-levn@~0.3.0:
+levn@^0.3.0, levn@~0.3.0:
version "0.3.0"
- resolved "http://registry.npm.taobao.org/levn/download/levn-0.3.0.tgz#3b09924edf9f083c0490fdd4c0bc4421e04764ee"
+ resolved "https://registry.yarnpkg.com/levn/-/levn-0.3.0.tgz#3b09924edf9f083c0490fdd4c0bc4421e04764ee"
+ integrity sha1-OwmSTt+fCDwEkP3UwLxEIeBHZO4=
dependencies:
prelude-ls "~1.1.2"
type-check "~0.3.2"
load-json-file@^1.0.0:
version "1.1.0"
- resolved "http://registry.npm.taobao.org/load-json-file/download/load-json-file-1.1.0.tgz#956905708d58b4bab4c2261b04f59f31c99374c0"
+ resolved "https://registry.yarnpkg.com/load-json-file/-/load-json-file-1.1.0.tgz#956905708d58b4bab4c2261b04f59f31c99374c0"
+ integrity sha1-lWkFcI1YtLq0wiYbBPWfMcmTdMA=
dependencies:
graceful-fs "^4.1.2"
parse-json "^2.2.0"
@@ -5643,7 +5924,8 @@ load-json-file@^1.0.0:
load-json-file@^2.0.0:
version "2.0.0"
- resolved "http://registry.npm.taobao.org/load-json-file/download/load-json-file-2.0.0.tgz#7947e42149af80d696cbf797bcaabcfe1fe29ca8"
+ resolved "https://registry.yarnpkg.com/load-json-file/-/load-json-file-2.0.0.tgz#7947e42149af80d696cbf797bcaabcfe1fe29ca8"
+ integrity sha1-eUfkIUmvgNaWy/eXvKq8/h/inKg=
dependencies:
graceful-fs "^4.1.2"
parse-json "^2.2.0"
@@ -5652,7 +5934,8 @@ load-json-file@^2.0.0:
load-json-file@^4.0.0:
version "4.0.0"
- resolved "http://registry.npm.taobao.org/load-json-file/download/load-json-file-4.0.0.tgz#2f5f45ab91e33216234fd53adab668eb4ec0993b"
+ resolved "https://registry.yarnpkg.com/load-json-file/-/load-json-file-4.0.0.tgz#2f5f45ab91e33216234fd53adab668eb4ec0993b"
+ integrity sha1-L19Fq5HjMhYjT9U62rZo607AmTs=
dependencies:
graceful-fs "^4.1.2"
parse-json "^4.0.0"
@@ -5660,29 +5943,23 @@ load-json-file@^4.0.0:
strip-bom "^3.0.0"
loader-runner@^2.3.0:
- version "2.3.0"
- resolved "http://registry.npm.taobao.org/loader-runner/download/loader-runner-2.3.0.tgz#f482aea82d543e07921700d5a46ef26fdac6b8a2"
-
-loader-utils@^0.2.16:
- version "0.2.17"
- resolved "http://registry.npm.taobao.org/loader-utils/download/loader-utils-0.2.17.tgz#f86e6374d43205a6e6c60e9196f17c0299bfb348"
- dependencies:
- big.js "^3.1.3"
- emojis-list "^2.0.0"
- json5 "^0.5.0"
- object-assign "^4.0.1"
+ version "2.4.0"
+ resolved "https://registry.yarnpkg.com/loader-runner/-/loader-runner-2.4.0.tgz#ed47066bfe534d7e84c4c7b9998c2a75607d9357"
+ integrity sha512-Jsmr89RcXGIwivFY21FcRrisYZfvLMTWx5kOLc+JTxtpBOG6xML0vzbc6SEQG2FO9/4Fc3wW4LVcB5DmGflaRw==
-loader-utils@^1.0.1, loader-utils@^1.0.2, loader-utils@^1.1.0:
- version "1.1.0"
- resolved "http://registry.npm.taobao.org/loader-utils/download/loader-utils-1.1.0.tgz#c98aef488bcceda2ffb5e2de646d6a754429f5cd"
[email protected], loader-utils@^1.0.2, loader-utils@^1.1.0, loader-utils@^1.2.3:
+ version "1.2.3"
+ resolved "https://registry.yarnpkg.com/loader-utils/-/loader-utils-1.2.3.tgz#1ff5dc6911c9f0a062531a4c04b609406108c2c7"
+ integrity sha512-fkpz8ejdnEMG3s37wGL07iSBDg99O9D5yflE9RGNH3hRdx9SOwYfnGYdZOUIZitN8E+E2vkq3MUMYMvPYl5ZZA==
dependencies:
- big.js "^3.1.3"
+ big.js "^5.2.2"
emojis-list "^2.0.0"
- json5 "^0.5.0"
+ json5 "^1.0.1"
locate-path@^2.0.0:
version "2.0.0"
- resolved "http://registry.npm.taobao.org/locate-path/download/locate-path-2.0.0.tgz#2b568b265eec944c6d9c0de9c3dbbbca0354cd8e"
+ resolved "https://registry.yarnpkg.com/locate-path/-/locate-path-2.0.0.tgz#2b568b265eec944c6d9c0de9c3dbbbca0354cd8e"
+ integrity sha1-K1aLJl7slExtnA3pw9u7ygNUzY4=
dependencies:
p-locate "^2.0.0"
path-exists "^3.0.0"
@@ -5695,283 +5972,254 @@ locate-path@^3.0.0:
p-locate "^3.0.0"
path-exists "^3.0.0"
-lodash-es@^4.17.5, lodash-es@^4.2.1:
- version "4.17.10"
- resolved "http://registry.npm.taobao.org/lodash-es/download/lodash-es-4.17.10.tgz#62cd7104cdf5dd87f235a837f0ede0e8e5117e05"
-
-lodash._getnative@^3.0.0:
- version "3.9.1"
- resolved "http://registry.npm.taobao.org/lodash._getnative/download/lodash._getnative-3.9.1.tgz#570bc7dede46d61cdcde687d65d3eecbaa3aaff5"
+locate-path@^5.0.0:
+ version "5.0.0"
+ resolved "https://registry.yarnpkg.com/locate-path/-/locate-path-5.0.0.tgz#1afba396afd676a6d42504d0a67a3a7eb9f62aa0"
+ integrity sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==
+ dependencies:
+ p-locate "^4.1.0"
lodash._reinterpolate@~3.0.0:
version "3.0.0"
- resolved "http://registry.npm.taobao.org/lodash._reinterpolate/download/lodash._reinterpolate-3.0.0.tgz#0ccf2d89166af03b3663c796538b75ac6e114d9d"
+ resolved "https://registry.yarnpkg.com/lodash._reinterpolate/-/lodash._reinterpolate-3.0.0.tgz#0ccf2d89166af03b3663c796538b75ac6e114d9d"
+ integrity sha1-DM8tiRZq8Ds2Y8eWU4t1rG4RTZ0=
lodash.assign@^4.2.0:
version "4.2.0"
- resolved "http://registry.npm.taobao.org/lodash.assign/download/lodash.assign-4.2.0.tgz#0d99f3ccd7a6d261d19bdaeb9245005d285808e7"
-
[email protected], lodash.camelcase@^4.3.0:
- version "4.3.0"
- resolved "http://registry.npm.taobao.org/lodash.camelcase/download/lodash.camelcase-4.3.0.tgz#b28aa6288a2b9fc651035c7711f65ab6190331a6"
+ resolved "https://registry.yarnpkg.com/lodash.assign/-/lodash.assign-4.2.0.tgz#0d99f3ccd7a6d261d19bdaeb9245005d285808e7"
+ integrity sha1-DZnzzNem0mHRm9rrkkUAXShYCOc=
-lodash.clonedeep@^4.3.2:
+lodash.clonedeep@^4.5.0:
version "4.5.0"
- resolved "http://registry.npm.taobao.org/lodash.clonedeep/download/lodash.clonedeep-4.5.0.tgz#e23f3f9c4f8fbdde872529c1071857a086e5ccef"
+ resolved "https://registry.yarnpkg.com/lodash.clonedeep/-/lodash.clonedeep-4.5.0.tgz#e23f3f9c4f8fbdde872529c1071857a086e5ccef"
+ integrity sha1-4j8/nE+Pvd6HJSnBBxhXoIblzO8=
-lodash.debounce@^4.0.0, lodash.debounce@^4.0.8:
- version "4.0.8"
- resolved "http://registry.npm.taobao.org/lodash.debounce/download/lodash.debounce-4.0.8.tgz#82d79bff30a67c4005ffd5e2515300ad9ca4d7af"
+lodash.defaults@^4.2.0:
+ version "4.2.0"
+ resolved "https://registry.yarnpkg.com/lodash.defaults/-/lodash.defaults-4.2.0.tgz#d09178716ffea4dde9e5fb7b37f6f0802274580c"
+ integrity sha1-0JF4cW/+pN3p5ft7N/bwgCJ0WAw=
-lodash.endswith@^4.2.1:
- version "4.2.1"
- resolved "http://registry.npm.taobao.org/lodash.endswith/download/lodash.endswith-4.2.1.tgz#fed59ac1738ed3e236edd7064ec456448b37bc09"
+lodash.difference@^4.5.0:
+ version "4.5.0"
+ resolved "https://registry.yarnpkg.com/lodash.difference/-/lodash.difference-4.5.0.tgz#9ccb4e505d486b91651345772885a2df27fd017c"
+ integrity sha1-nMtOUF1Ia5FlE0V3KIWi3yf9AXw=
-lodash.flattendeep@^4.4.0:
+lodash.flatten@^4.4.0:
version "4.4.0"
- resolved "http://registry.npm.taobao.org/lodash.flattendeep/download/lodash.flattendeep-4.4.0.tgz#fb030917f86a3134e5bc9bec0d69e0013ddfedb2"
-
-lodash.get@^4.4.2:
- version "4.4.2"
- resolved "http://registry.npm.taobao.org/lodash.get/download/lodash.get-4.4.2.tgz#2d177f652fa31e939b4438d5341499dfa3825e99"
-
-lodash.isarguments@^3.0.0:
- version "3.1.0"
- resolved "http://registry.npm.taobao.org/lodash.isarguments/download/lodash.isarguments-3.1.0.tgz#2f573d85c6a24289ff00663b491c1d338ff3458a"
+ resolved "https://registry.yarnpkg.com/lodash.flatten/-/lodash.flatten-4.4.0.tgz#f31c22225a9632d2bbf8e4addbef240aa765a61f"
+ integrity sha1-8xwiIlqWMtK7+OSt2+8kCqdlph8=
-lodash.isarray@^3.0.0:
- version "3.0.4"
- resolved "http://registry.npm.taobao.org/lodash.isarray/download/lodash.isarray-3.0.4.tgz#79e4eb88c36a8122af86f844aa9bcd851b5fbb55"
-
-lodash.isfunction@^3.0.8:
- version "3.0.9"
- resolved "http://registry.npm.taobao.org/lodash.isfunction/download/lodash.isfunction-3.0.9.tgz#06de25df4db327ac931981d1bdb067e5af68d051"
-
-lodash.isstring@^4.0.1:
- version "4.0.1"
- resolved "http://registry.npm.taobao.org/lodash.isstring/download/lodash.isstring-4.0.1.tgz#d527dfb5456eca7cc9bb95d5daeaf88ba54a5451"
-
[email protected]:
- version "4.1.1"
- resolved "http://registry.npm.taobao.org/lodash.kebabcase/download/lodash.kebabcase-4.1.1.tgz#8489b1cb0d29ff88195cceca448ff6d6cc295c36"
+lodash.ismatch@^4.4.0:
+ version "4.4.0"
+ resolved "https://registry.yarnpkg.com/lodash.ismatch/-/lodash.ismatch-4.4.0.tgz#756cb5150ca3ba6f11085a78849645f188f85f37"
+ integrity sha1-dWy1FQyjum8RCFp4hJZF8Yj4Xzc=
-lodash.keys@^3.1.2:
- version "3.1.2"
- resolved "http://registry.npm.taobao.org/lodash.keys/download/lodash.keys-3.1.2.tgz#4dbc0472b156be50a0b286855d1bd0b0c656098a"
- dependencies:
- lodash._getnative "^3.0.0"
- lodash.isarguments "^3.0.0"
- lodash.isarray "^3.0.0"
+lodash.isplainobject@^4.0.6:
+ version "4.0.6"
+ resolved "https://registry.yarnpkg.com/lodash.isplainobject/-/lodash.isplainobject-4.0.6.tgz#7c526a52d89b45c45cc690b88163be0497f550cb"
+ integrity sha1-fFJqUtibRcRcxpC4gWO+BJf1UMs=
lodash.map@^4.5.1:
version "4.6.0"
- resolved "http://registry.npm.taobao.org/lodash.map/download/lodash.map-4.6.0.tgz#771ec7839e3473d9c4cde28b19394c3562f4f6d3"
-
-lodash.memoize@^4.1.2:
- version "4.1.2"
- resolved "http://registry.npm.taobao.org/lodash.memoize/download/lodash.memoize-4.1.2.tgz#bcc6c49a42a2840ed997f323eada5ecd182e0bfe"
-
[email protected]:
- version "4.6.1"
- resolved "http://registry.npm.taobao.org/lodash.merge/download/lodash.merge-4.6.1.tgz#adc25d9cb99b9391c59624f379fbba60d7111d54"
-
[email protected], lodash.mergewith@^4.6.0:
- version "4.6.1"
- resolved "http://registry.npm.taobao.org/lodash.mergewith/download/lodash.mergewith-4.6.1.tgz#639057e726c3afbdb3e7d42741caa8d6e4335927"
-
[email protected]:
- version "4.5.0"
- resolved "http://registry.npm.taobao.org/lodash.omit/download/lodash.omit-4.5.0.tgz#6eb19ae5a1ee1dd9df0b969e66ce0b7fa30b5e60"
-
[email protected]:
- version "4.4.0"
- resolved "http://registry.npm.taobao.org/lodash.pick/download/lodash.pick-4.4.0.tgz#52f05610fff9ded422611441ed1fc123a03001b3"
-
[email protected]:
- version "4.1.1"
- resolved "http://registry.npm.taobao.org/lodash.snakecase/download/lodash.snakecase-4.1.1.tgz#39d714a35357147837aefd64b5dcbb16becd8f8d"
+ resolved "https://registry.yarnpkg.com/lodash.map/-/lodash.map-4.6.0.tgz#771ec7839e3473d9c4cde28b19394c3562f4f6d3"
+ integrity sha1-dx7Hg540c9nEzeKLGTlMNWL09tM=
lodash.sortby@^4.7.0:
version "4.7.0"
- resolved "http://registry.npm.taobao.org/lodash.sortby/download/lodash.sortby-4.7.0.tgz#edd14c824e2cc9c1e0b0a1b42bb5210516a42438"
-
[email protected]:
- version "4.4.0"
- resolved "http://registry.npm.taobao.org/lodash.startcase/download/lodash.startcase-4.4.0.tgz#9436e34ed26093ed7ffae1936144350915d9add8"
-
-lodash.startswith@^4.2.1:
- version "4.2.1"
- resolved "http://registry.npm.taobao.org/lodash.startswith/download/lodash.startswith-4.2.1.tgz#c598c4adce188a27e53145731cdc6c0e7177600c"
-
-lodash.tail@^4.1.1:
- version "4.1.1"
- resolved "http://registry.npm.taobao.org/lodash.tail/download/lodash.tail-4.1.1.tgz#d2333a36d9e7717c8ad2f7cacafec7c32b444664"
+ resolved "https://registry.yarnpkg.com/lodash.sortby/-/lodash.sortby-4.7.0.tgz#edd14c824e2cc9c1e0b0a1b42bb5210516a42438"
+ integrity sha1-7dFMgk4sycHgsKG0K7UhBRakJDg=
lodash.template@^4.0.2:
version "4.4.0"
- resolved "http://registry.npm.taobao.org/lodash.template/download/lodash.template-4.4.0.tgz#e73a0385c8355591746e020b99679c690e68fba0"
+ resolved "https://registry.yarnpkg.com/lodash.template/-/lodash.template-4.4.0.tgz#e73a0385c8355591746e020b99679c690e68fba0"
+ integrity sha1-5zoDhcg1VZF0bgILmWecaQ5o+6A=
dependencies:
lodash._reinterpolate "~3.0.0"
lodash.templatesettings "^4.0.0"
lodash.templatesettings@^4.0.0:
version "4.1.0"
- resolved "http://registry.npm.taobao.org/lodash.templatesettings/download/lodash.templatesettings-4.1.0.tgz#2b4d4e95ba440d915ff08bc899e4553666713316"
+ resolved "https://registry.yarnpkg.com/lodash.templatesettings/-/lodash.templatesettings-4.1.0.tgz#2b4d4e95ba440d915ff08bc899e4553666713316"
+ integrity sha1-K01OlbpEDZFf8IvImeRVNmZxMxY=
dependencies:
lodash._reinterpolate "~3.0.0"
-lodash.throttle@^4.0.0:
- version "4.1.1"
- resolved "http://registry.npm.taobao.org/lodash.throttle/download/lodash.throttle-4.1.1.tgz#c23e91b710242ac70c37f1e1cda9274cc39bf2f4"
-
[email protected]:
- version "4.3.0"
- resolved "http://registry.npm.taobao.org/lodash.topairs/download/lodash.topairs-4.3.0.tgz#3b6deaa37d60fb116713c46c5f17ea190ec48d64"
-
-lodash.uniq@^4.5.0:
- version "4.5.0"
- resolved "http://registry.npm.taobao.org/lodash.uniq/download/lodash.uniq-4.5.0.tgz#d0225373aeb652adc1bc82e4945339a842754773"
+lodash.toarray@^4.4.0:
+ version "4.4.0"
+ resolved "https://registry.yarnpkg.com/lodash.toarray/-/lodash.toarray-4.4.0.tgz#24c4bfcd6b2fba38bfd0594db1179d8e9b656561"
+ integrity sha1-JMS/zWsvuji/0FlNsRedjptlZWE=
[email protected]:
- version "4.3.1"
- resolved "http://registry.npm.taobao.org/lodash.upperfirst/download/lodash.upperfirst-4.3.1.tgz#1365edf431480481ef0d1c68957a5ed99d49f7ce"
[email protected]:
+ version "4.0.1"
+ resolved "https://registry.yarnpkg.com/lodash.unescape/-/lodash.unescape-4.0.1.tgz#bf2249886ce514cda112fae9218cdc065211fc9c"
+ integrity sha1-vyJJiGzlFM2hEvrpIYzcBlIR/Jw=
[email protected]:
- version "4.17.5"
- resolved "http://registry.npm.taobao.org/lodash/download/lodash-4.17.5.tgz#99a92d65c0272debe8c96b6057bc8fbfa3bed511"
+lodash.union@^4.6.0:
+ version "4.6.0"
+ resolved "https://registry.yarnpkg.com/lodash.union/-/lodash.union-4.6.0.tgz#48bb5088409f16f1821666641c44dd1aaae3cd88"
+ integrity sha1-SLtQiECfFvGCFmZkHETdGqrjzYg=
-lodash@^4.0.0, lodash@^4.13.1, lodash@^4.15.0, lodash@^4.16.3, lodash@^4.16.5, lodash@^4.17.10, lodash@^4.17.2, lodash@^4.17.3, lodash@^4.17.4, lodash@^4.17.5, lodash@^4.2.0, lodash@^4.2.1, lodash@^4.3.0, lodash@^4.8.0, lodash@~4.17.4:
- version "4.17.10"
- resolved "http://registry.npm.taobao.org/lodash/download/lodash-4.17.10.tgz#1b7793cf7259ea38fb3661d4d38b3260af8ae4e7"
[email protected], lodash@^4.16.3, lodash@^4.17.10, lodash@^4.17.11, lodash@^4.2.1:
+ version "4.17.11"
+ resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.11.tgz#b39ea6229ef607ecd89e2c8df12536891cac9b8d"
+ integrity sha512-cQKh8igo5QUhZ7lg38DYWAxMvjSAKG0A8wGSVimP07SIUEK2UO+arSRKbRZWtelMtN5V0Hkwh5ryOto/SshYIg==
-loglevel@^1.4.1:
- version "1.6.1"
- resolved "http://registry.npm.taobao.org/loglevel/download/loglevel-1.6.1.tgz#e0fc95133b6ef276cdc8887cdaf24aa6f156f8fa"
+loglevel@^1.6.3:
+ version "1.6.3"
+ resolved "https://registry.yarnpkg.com/loglevel/-/loglevel-1.6.3.tgz#77f2eb64be55a404c9fd04ad16d57c1d6d6b1280"
+ integrity sha512-LoEDv5pgpvWgPF4kNYuIp0qqSJVWak/dML0RY74xlzMZiT9w77teNAwKYKWBTYjlokMirg+o3jBwp+vlLrcfAA==
-lolex@^2.2.0, lolex@^2.3.2:
- version "2.7.0"
- resolved "http://registry.npm.taobao.org/lolex/download/lolex-2.7.0.tgz#9c087a69ec440e39d3f796767cf1b2cdc43d5ea5"
+lolex@^4.0.1, lolex@^4.1.0:
+ version "4.1.0"
+ resolved "https://registry.yarnpkg.com/lolex/-/lolex-4.1.0.tgz#ecdd7b86539391d8237947a3419aa8ac975f0fe1"
+ integrity sha512-BYxIEXiVq5lGIXeVHnsFzqa1TxN5acnKnPCdlZSpzm8viNEOhiigupA4vTQ9HEFQ6nLTQ9wQOgBknJgzUYQ9Aw==
longest@^1.0.1:
version "1.0.1"
- resolved "http://registry.npm.taobao.org/longest/download/longest-1.0.1.tgz#30a0b2da38f73770e8294a0d22e6625ed77d0097"
+ resolved "https://registry.yarnpkg.com/longest/-/longest-1.0.1.tgz#30a0b2da38f73770e8294a0d22e6625ed77d0097"
+ integrity sha1-MKCy2jj3N3DoKUoNIuZiXtd9AJc=
-loose-envify@^1.0.0, loose-envify@^1.1.0, loose-envify@^1.3.1:
- version "1.3.1"
- resolved "http://registry.npm.taobao.org/loose-envify/download/loose-envify-1.3.1.tgz#d1a8ad33fa9ce0e713d65fdd0ac8b748d478c848"
+loose-envify@^1.0.0, loose-envify@^1.1.0, loose-envify@^1.4.0:
+ version "1.4.0"
+ resolved "https://registry.yarnpkg.com/loose-envify/-/loose-envify-1.4.0.tgz#71ee51fa7be4caec1a63839f7e682d8132d30caf"
+ integrity sha512-lyuxPGr/Wfhrlem2CL/UcnUc1zcqKAImBDzukY7Y5F/yQiNdko6+fRLevlw1HgMySw7f611UIY408EtxRSoK3Q==
dependencies:
- js-tokens "^3.0.0"
+ js-tokens "^3.0.0 || ^4.0.0"
loud-rejection@^1.0.0:
version "1.6.0"
- resolved "http://registry.npm.taobao.org/loud-rejection/download/loud-rejection-1.6.0.tgz#5b46f80147edee578870f086d04821cf998e551f"
+ resolved "https://registry.yarnpkg.com/loud-rejection/-/loud-rejection-1.6.0.tgz#5b46f80147edee578870f086d04821cf998e551f"
+ integrity sha1-W0b4AUft7leIcPCG0Eghz5mOVR8=
dependencies:
currently-unhandled "^0.4.1"
signal-exit "^3.0.0"
lower-case@^1.1.1:
version "1.1.4"
- resolved "http://registry.npm.taobao.org/lower-case/download/lower-case-1.1.4.tgz#9a2cabd1b9e8e0ae993a4bf7d5875c39c42e8eac"
+ resolved "https://registry.yarnpkg.com/lower-case/-/lower-case-1.1.4.tgz#9a2cabd1b9e8e0ae993a4bf7d5875c39c42e8eac"
+ integrity sha1-miyr0bno4K6ZOkv31YdcOcQujqw=
-lru-cache@^4.0.1, lru-cache@^4.1.1:
- version "4.1.3"
- resolved "http://registry.npm.taobao.org/lru-cache/download/lru-cache-4.1.3.tgz#a1175cf3496dfc8436c156c334b4955992bce69c"
+lru-cache@^4.1.1:
+ version "4.1.5"
+ resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-4.1.5.tgz#8bbe50ea85bed59bc9e33dcab8235ee9bcf443cd"
+ integrity sha512-sWZlbEP2OsHNkXrMl5GYk/jKk70MBng6UU4YI/qGDYbgf6YbP4EvmqISbXCoJiRKs+1bSpFHVgQxvJ17F2li5g==
dependencies:
pseudomap "^1.0.2"
yallist "^2.1.2"
+lru-cache@^5.1.1:
+ version "5.1.1"
+ resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-5.1.1.tgz#1da27e6710271947695daf6848e847f01d84b920"
+ integrity sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w==
+ dependencies:
+ yallist "^3.0.2"
+
make-dir@^1.0.0:
version "1.3.0"
- resolved "http://registry.npm.taobao.org/make-dir/download/make-dir-1.3.0.tgz#79c1033b80515bd6d24ec9933e860ca75ee27f0c"
+ resolved "https://registry.yarnpkg.com/make-dir/-/make-dir-1.3.0.tgz#79c1033b80515bd6d24ec9933e860ca75ee27f0c"
+ integrity sha512-2w31R7SJtieJJnQtGc7RVL2StM2vGYVfqUOvUDxH6bC6aJTxPxTF0GnIgCyu7tjockiUWAYQRbxa7vKn34s5sQ==
dependencies:
pify "^3.0.0"
+make-dir@^2.0.0, make-dir@^2.1.0:
+ version "2.1.0"
+ resolved "https://registry.yarnpkg.com/make-dir/-/make-dir-2.1.0.tgz#5f0310e18b8be898cc07009295a30ae41e91e6f5"
+ integrity sha512-LS9X+dc8KLxXCb8dni79fLIIUA5VyZoyjSMCwTluaXA0o27cCK0bhXkpgw+sTXVpPy/lSO57ilRixqk0vDmtRA==
+ dependencies:
+ pify "^4.0.1"
+ semver "^5.6.0"
+
[email protected]:
version "1.0.11"
- resolved "http://registry.npm.taobao.org/makeerror/download/makeerror-1.0.11.tgz#e01a5c9109f2af79660e4e8b9587790184f5a96c"
+ resolved "https://registry.yarnpkg.com/makeerror/-/makeerror-1.0.11.tgz#e01a5c9109f2af79660e4e8b9587790184f5a96c"
+ integrity sha1-4BpckQnyr3lmDk6LlYd5AYT1qWw=
dependencies:
tmpl "1.0.x"
+mamacro@^0.0.3:
+ version "0.0.3"
+ resolved "https://registry.yarnpkg.com/mamacro/-/mamacro-0.0.3.tgz#ad2c9576197c9f1abf308d0787865bd975a3f3e4"
+ integrity sha512-qMEwh+UujcQ+kbz3T6V+wAmO2U8veoq2w+3wY8MquqwVA3jChfwY+Tk52GZKDfACEPjuZ7r2oJLejwpt8jtwTA==
+
+map-age-cleaner@^0.1.1:
+ version "0.1.3"
+ resolved "https://registry.yarnpkg.com/map-age-cleaner/-/map-age-cleaner-0.1.3.tgz#7d583a7306434c055fe474b0f45078e6e1b4b92a"
+ integrity sha512-bJzx6nMoP6PDLPBFmg7+xRKeFZvFboMrGlxmNj9ClvX53KrmvM5bXFXEWjbz4cz1AFn+jWJ9z/DJSz7hrs0w3w==
+ dependencies:
+ p-defer "^1.0.0"
+
map-cache@^0.2.2:
version "0.2.2"
- resolved "http://registry.npm.taobao.org/map-cache/download/map-cache-0.2.2.tgz#c32abd0bd6525d9b051645bb4f26ac5dc98a0dbf"
+ resolved "https://registry.yarnpkg.com/map-cache/-/map-cache-0.2.2.tgz#c32abd0bd6525d9b051645bb4f26ac5dc98a0dbf"
+ integrity sha1-wyq9C9ZSXZsFFkW7TyasXcmKDb8=
map-obj@^1.0.0, map-obj@^1.0.1:
version "1.0.1"
- resolved "http://registry.npm.taobao.org/map-obj/download/map-obj-1.0.1.tgz#d933ceb9205d82bdcf4886f6742bdc2b4dea146d"
+ resolved "https://registry.yarnpkg.com/map-obj/-/map-obj-1.0.1.tgz#d933ceb9205d82bdcf4886f6742bdc2b4dea146d"
+ integrity sha1-2TPOuSBdgr3PSIb2dCvcK03qFG0=
map-obj@^2.0.0:
version "2.0.0"
- resolved "http://registry.npm.taobao.org/map-obj/download/map-obj-2.0.0.tgz#a65cd29087a92598b8791257a523e021222ac1f9"
+ resolved "https://registry.yarnpkg.com/map-obj/-/map-obj-2.0.0.tgz#a65cd29087a92598b8791257a523e021222ac1f9"
+ integrity sha1-plzSkIepJZi4eRJXpSPgISIqwfk=
map-visit@^1.0.0:
version "1.0.0"
- resolved "http://registry.npm.taobao.org/map-visit/download/map-visit-1.0.0.tgz#ecdca8f13144e660f1b5bd41f12f3479d98dfb8f"
+ resolved "https://registry.yarnpkg.com/map-visit/-/map-visit-1.0.0.tgz#ecdca8f13144e660f1b5bd41f12f3479d98dfb8f"
+ integrity sha1-7Nyo8TFE5mDxtb1B8S80edmN+48=
dependencies:
object-visit "^1.0.0"
-math-expression-evaluator@^1.2.14:
- version "1.2.17"
- resolved "http://registry.npm.taobao.org/math-expression-evaluator/download/math-expression-evaluator-1.2.17.tgz#de819fdbcd84dccd8fae59c6aeb79615b9d266ac"
-
-math-random@^1.0.1:
- version "1.0.1"
- resolved "http://registry.npm.taobao.org/math-random/download/math-random-1.0.1.tgz#8b3aac588b8a66e4975e3cdea67f7bb329601fac"
-
md5.js@^1.3.4:
- version "1.3.4"
- resolved "http://registry.npm.taobao.org/md5.js/download/md5.js-1.3.4.tgz#e9bdbde94a20a5ac18b04340fc5764d5b09d901d"
+ version "1.3.5"
+ resolved "https://registry.yarnpkg.com/md5.js/-/md5.js-1.3.5.tgz#b5d07b8e3216e3e27cd728d72f70d1e6a342005f"
+ integrity sha512-xitP+WxNPcTTOgnTJcrhM0xvdPepipPSf3I8EIpGKeFLjt3PlJLIDG3u8EX53ZIubkb+5U2+3rELYpEhHhzdkg==
dependencies:
hash-base "^3.0.0"
inherits "^2.0.1"
-
-md5@^2.2.1:
- version "2.2.1"
- resolved "https://registry.yarnpkg.com/md5/-/md5-2.2.1.tgz#53ab38d5fe3c8891ba465329ea23fac0540126f9"
- dependencies:
- charenc "~0.0.1"
- crypt "~0.0.1"
- is-buffer "~1.1.1"
+ safe-buffer "^5.1.2"
[email protected]:
version "0.3.0"
- resolved "http://registry.npm.taobao.org/media-typer/download/media-typer-0.3.0.tgz#8710d7af0aa626f8fffa1ce00168545263255748"
+ resolved "https://registry.yarnpkg.com/media-typer/-/media-typer-0.3.0.tgz#8710d7af0aa626f8fffa1ce00168545263255748"
+ integrity sha1-hxDXrwqmJvj/+hzgAWhUUmMlV0g=
-mem@^1.1.0:
- version "1.1.0"
- resolved "http://registry.npm.taobao.org/mem/download/mem-1.1.0.tgz#5edd52b485ca1d900fe64895505399a0dfa45f76"
+mem@^4.0.0:
+ version "4.3.0"
+ resolved "https://registry.yarnpkg.com/mem/-/mem-4.3.0.tgz#461af497bc4ae09608cdb2e60eefb69bff744178"
+ integrity sha512-qX2bG48pTqYRVmDB37rn/6PT7LcR8T7oAX3bf99u1Tt1nzxYfxkgqDwUwolPlXweM0XzBOBFzSx4kfp7KP1s/w==
dependencies:
- mimic-fn "^1.0.0"
-
-memoize-one@^5.0.0:
- version "5.0.0"
- resolved "http://registry.npm.taobao.org/memoize-one/download/memoize-one-5.0.0.tgz#d55007dffefb8de7546659a1722a5d42e128286e"
- integrity sha1-1VAH3/77jedUZlmhcipdQuEoKG4=
+ map-age-cleaner "^0.1.1"
+ mimic-fn "^2.0.0"
+ p-is-promise "^2.0.0"
-memory-fs@^0.4.0, memory-fs@~0.4.1:
+memory-fs@^0.4.0, memory-fs@^0.4.1, memory-fs@~0.4.1:
version "0.4.1"
- resolved "http://registry.npm.taobao.org/memory-fs/download/memory-fs-0.4.1.tgz#3a9a20b8462523e447cfbc7e8bb80ed667bfc552"
+ resolved "https://registry.yarnpkg.com/memory-fs/-/memory-fs-0.4.1.tgz#3a9a20b8462523e447cfbc7e8bb80ed667bfc552"
+ integrity sha1-OpoguEYlI+RHz7x+i7gO1me/xVI=
dependencies:
errno "^0.1.3"
readable-stream "^2.0.1"
[email protected]:
- version "4.0.0"
- resolved "http://registry.npm.taobao.org/meow/download/meow-4.0.0.tgz#fd5855dd008db5b92c552082db1c307cba20b29d"
[email protected]:
+ version "5.0.0"
+ resolved "https://registry.yarnpkg.com/meow/-/meow-5.0.0.tgz#dfc73d63a9afc714a5e371760eb5c88b91078aa4"
+ integrity sha512-CbTqYU17ABaLefO8vCU153ZZlprKYWDljcndKKDCFcYQITzWCXZAVk4QMFZPgvzrnUQ3uItnIE/LoUOwrT15Ig==
dependencies:
camelcase-keys "^4.0.0"
decamelize-keys "^1.0.0"
loud-rejection "^1.0.0"
- minimist "^1.1.3"
minimist-options "^3.0.1"
normalize-package-data "^2.3.4"
read-pkg-up "^3.0.0"
redent "^2.0.0"
trim-newlines "^2.0.0"
+ yargs-parser "^10.0.0"
-meow@^3.3.0, meow@^3.7.0:
+meow@^3.3.0:
version "3.7.0"
- resolved "http://registry.npm.taobao.org/meow/download/meow-3.7.0.tgz#72cb668b425228290abbfa856892587308a801fb"
+ resolved "https://registry.yarnpkg.com/meow/-/meow-3.7.0.tgz#72cb668b425228290abbfa856892587308a801fb"
+ integrity sha1-cstmi0JSKCkKu/qFaJJYcwioAfs=
dependencies:
camelcase-keys "^2.0.0"
decamelize "^1.1.2"
@@ -5986,7 +6234,8 @@ meow@^3.3.0, meow@^3.7.0:
meow@^4.0.0:
version "4.0.1"
- resolved "http://registry.npm.taobao.org/meow/download/meow-4.0.1.tgz#d48598f6f4b1472f35bf6317a95945ace347f975"
+ resolved "https://registry.yarnpkg.com/meow/-/meow-4.0.1.tgz#d48598f6f4b1472f35bf6317a95945ace347f975"
+ integrity sha512-xcSBHD5Z86zaOc+781KrupuHAzeGXSLtiAOmBsiLDiPSaYSB6hdew2ng9EBAnZ62jagG9MHAOdxpDi/lWBFJ/A==
dependencies:
camelcase-keys "^4.0.0"
decamelize-keys "^1.0.0"
@@ -6000,43 +6249,35 @@ meow@^4.0.0:
[email protected]:
version "1.0.1"
- resolved "http://registry.npm.taobao.org/merge-descriptors/download/merge-descriptors-1.0.1.tgz#b00aaa556dd8b44568150ec9d1b953f3f90cbb61"
+ resolved "https://registry.yarnpkg.com/merge-descriptors/-/merge-descriptors-1.0.1.tgz#b00aaa556dd8b44568150ec9d1b953f3f90cbb61"
+ integrity sha1-sAqqVW3YtEVoFQ7J0blT8/kMu2E=
merge-stream@^1.0.1:
version "1.0.1"
- resolved "http://registry.npm.taobao.org/merge-stream/download/merge-stream-1.0.1.tgz#4041202d508a342ba00174008df0c251b8c135e1"
+ resolved "https://registry.yarnpkg.com/merge-stream/-/merge-stream-1.0.1.tgz#4041202d508a342ba00174008df0c251b8c135e1"
+ integrity sha1-QEEgLVCKNCugAXQAjfDCUbjBNeE=
dependencies:
readable-stream "^2.0.1"
-merge@^1.1.3, merge@^1.2.0:
- version "1.2.0"
- resolved "http://registry.npm.taobao.org/merge/download/merge-1.2.0.tgz#7531e39d4949c281a66b8c5a6e0265e8b05894da"
+merge2@^1.2.3:
+ version "1.2.3"
+ resolved "https://registry.yarnpkg.com/merge2/-/merge2-1.2.3.tgz#7ee99dbd69bb6481689253f018488a1b902b0ed5"
+ integrity sha512-gdUU1Fwj5ep4kplwcmftruWofEFt6lfpkkr3h860CXbAB9c3hGb55EOL2ali0Td5oebvW0E1+3Sr+Ur7XfKpRA==
+
+merge@^1.2.1:
+ version "1.2.1"
+ resolved "https://registry.yarnpkg.com/merge/-/merge-1.2.1.tgz#38bebf80c3220a8a487b6fcfb3941bb11720c145"
+ integrity sha512-VjFo4P5Whtj4vsLzsYBu5ayHhoHJ0UqNm7ibvShmbmoz7tGi0vXaoJbGdB+GmDMLUdg8DpQXEIeVDAe8MaABvQ==
methods@~1.1.2:
version "1.1.2"
- resolved "http://registry.npm.taobao.org/methods/download/methods-1.1.2.tgz#5529a4d67654134edcc5266656835b0f851afcee"
-
-micromatch@^2.1.5, micromatch@^2.3.11, micromatch@^2.3.7:
- version "2.3.11"
- resolved "http://registry.npm.taobao.org/micromatch/download/micromatch-2.3.11.tgz#86677c97d1720b363431d04d0d15293bd38c1565"
- dependencies:
- arr-diff "^2.0.0"
- array-unique "^0.2.1"
- braces "^1.8.2"
- expand-brackets "^0.1.4"
- extglob "^0.3.1"
- filename-regex "^2.0.0"
- is-extglob "^1.0.0"
- is-glob "^2.0.1"
- kind-of "^3.0.2"
- normalize-path "^2.0.1"
- object.omit "^2.0.0"
- parse-glob "^3.0.4"
- regex-cache "^0.4.2"
+ resolved "https://registry.yarnpkg.com/methods/-/methods-1.1.2.tgz#5529a4d67654134edcc5266656835b0f851afcee"
+ integrity sha1-VSmk1nZUE07cxSZmVoNbD4Ua/O4=
-micromatch@^3.1.4, micromatch@^3.1.8:
+micromatch@^3.0.4, micromatch@^3.1.10, micromatch@^3.1.4, micromatch@^3.1.8:
version "3.1.10"
- resolved "http://registry.npm.taobao.org/micromatch/download/micromatch-3.1.10.tgz#70859bc95c9840952f359a068a3fc49f9ecfac23"
+ resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-3.1.10.tgz#70859bc95c9840952f359a068a3fc49f9ecfac23"
+ integrity sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg==
dependencies:
arr-diff "^4.0.0"
array-unique "^0.3.2"
@@ -6052,114 +6293,130 @@ micromatch@^3.1.4, micromatch@^3.1.8:
snapdragon "^0.8.1"
to-regex "^3.0.2"
+micromatch@^4.0.2:
+ version "4.0.2"
+ resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-4.0.2.tgz#4fcb0999bf9fbc2fcbdd212f6d629b9a56c39259"
+ integrity sha512-y7FpHSbMUMoyPbYUSzO6PaZ6FyRnQOpHuKwbo1G+Knck95XVU4QAiKdGEnj5wwoS7PlOgthX/09u5iFJ+aYf5Q==
+ dependencies:
+ braces "^3.0.1"
+ picomatch "^2.0.5"
+
miller-rabin@^4.0.0:
version "4.0.1"
- resolved "http://registry.npm.taobao.org/miller-rabin/download/miller-rabin-4.0.1.tgz#f080351c865b0dc562a8462966daa53543c78a4d"
+ resolved "https://registry.yarnpkg.com/miller-rabin/-/miller-rabin-4.0.1.tgz#f080351c865b0dc562a8462966daa53543c78a4d"
+ integrity sha512-115fLhvZVqWwHPbClyntxEVfVDfl9DLLTuJvq3g2O/Oxi8AiNouAHvDSzHS0viUJc+V5vm3eq91Xwqn9dp4jRA==
dependencies:
bn.js "^4.0.0"
brorand "^1.0.1"
-"mime-db@>= 1.33.0 < 2", mime-db@~1.33.0:
- version "1.33.0"
- resolved "http://registry.npm.taobao.org/mime-db/download/mime-db-1.33.0.tgz#a3492050a5cb9b63450541e39d9788d2272783db"
[email protected], "mime-db@>= 1.40.0 < 2":
+ version "1.40.0"
+ resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.40.0.tgz#a65057e998db090f732a68f6c276d387d4126c32"
+ integrity sha512-jYdeOMPy9vnxEqFRRo6ZvTZ8d9oPb+k18PKoYNYUe2stVEBPPwsln/qWzdbmaIvnhZ9v2P+CuecK+fpUfsV2mA==
-mime-types@^2.1.12, mime-types@~2.1.17, mime-types@~2.1.18, mime-types@~2.1.7:
- version "2.1.18"
- resolved "http://registry.npm.taobao.org/mime-types/download/mime-types-2.1.18.tgz#6f323f60a83d11146f831ff11fd66e2fe5503bb8"
+mime-types@^2.1.12, mime-types@~2.1.17, mime-types@~2.1.19, mime-types@~2.1.24:
+ version "2.1.24"
+ resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.24.tgz#b6f8d0b3e951efb77dedeca194cff6d16f676f81"
+ integrity sha512-WaFHS3MCl5fapm3oLxU4eYDw77IQM2ACcxQ9RIxfaC3ooc6PFuBMGZZsYpvoXS5D5QTWPieo1jjLdAm3TBP3cQ==
dependencies:
- mime-db "~1.33.0"
-
[email protected]:
- version "1.4.1"
- resolved "http://registry.npm.taobao.org/mime/download/mime-1.4.1.tgz#121f9ebc49e3766f311a76e1fa1c8003c4b03aa6"
+ mime-db "1.40.0"
-mime@^1.5.0:
[email protected]:
version "1.6.0"
- resolved "http://registry.npm.taobao.org/mime/download/mime-1.6.0.tgz#32cd9e5c64553bd58d19a568af452acff04981b1"
+ resolved "https://registry.yarnpkg.com/mime/-/mime-1.6.0.tgz#32cd9e5c64553bd58d19a568af452acff04981b1"
+ integrity sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg==
-mime@^2.0.3:
- version "2.3.1"
- resolved "http://registry.npm.taobao.org/mime/download/mime-2.3.1.tgz#b1621c54d63b97c47d3cfe7f7215f7d64517c369"
+mime@^2.0.3, mime@^2.4.2:
+ version "2.4.4"
+ resolved "https://registry.yarnpkg.com/mime/-/mime-2.4.4.tgz#bd7b91135fc6b01cde3e9bae33d659b63d8857e5"
+ integrity sha512-LRxmNwziLPT828z+4YkNzloCFC2YM4wrB99k+AV5ZbEyfGNWfG8SO1FUXLmLDBSo89NrJZ4DIWeLjy1CHGhMGA==
mimic-fn@^1.0.0:
version "1.2.0"
- resolved "http://registry.npm.taobao.org/mimic-fn/download/mimic-fn-1.2.0.tgz#820c86a39334640e99516928bd03fca88057d022"
+ resolved "https://registry.yarnpkg.com/mimic-fn/-/mimic-fn-1.2.0.tgz#820c86a39334640e99516928bd03fca88057d022"
+ integrity sha512-jf84uxzwiuiIVKiOLpfYk7N46TSy8ubTonmneY9vrpHNAnp0QBt2BxWV9dO3/j+BoVAb+a5G6YDPW3M5HOdMWQ==
-mini-store@^1.0.2, mini-store@^1.1.0:
- version "1.1.2"
- resolved "http://registry.npm.taobao.org/mini-store/download/mini-store-1.1.2.tgz#cc150e0878e080ca58219d47fccefefe2c9aea3e"
- integrity sha1-zBUOCHjggMpYIZ1H/M7+/iya6j4=
+mimic-fn@^2.0.0:
+ version "2.1.0"
+ resolved "https://registry.yarnpkg.com/mimic-fn/-/mimic-fn-2.1.0.tgz#7ed2c2ccccaf84d3ffcb7a69b57711fc2083401b"
+ integrity sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==
+
+min-document@^2.19.0:
+ version "2.19.0"
+ resolved "https://registry.yarnpkg.com/min-document/-/min-document-2.19.0.tgz#7bd282e3f5842ed295bb748cdd9f1ffa2c824685"
+ integrity sha1-e9KC4/WELtKVu3SM3Z8f+iyCRoU=
dependencies:
- hoist-non-react-statics "^2.3.1"
- prop-types "^15.6.0"
- react-lifecycles-compat "^3.0.4"
- shallowequal "^1.0.2"
+ dom-walk "^0.1.0"
-mini-store@^2.0.0:
- version "2.0.0"
- resolved "http://registry.npm.taobao.org/mini-store/download/mini-store-2.0.0.tgz#0843c048d6942ce55e3e78b1b67fc063022b5488"
- integrity sha1-CEPASNaULOVePnixtn/AYwIrVIg=
+mini-css-extract-plugin@^0.6.0:
+ version "0.6.0"
+ resolved "https://registry.yarnpkg.com/mini-css-extract-plugin/-/mini-css-extract-plugin-0.6.0.tgz#a3f13372d6fcde912f3ee4cd039665704801e3b9"
+ integrity sha512-79q5P7YGI6rdnVyIAV4NXpBQJFWdkzJxCim3Kog4078fM0piAaFlwocqbejdWtLW1cEzCexPrh6EdyFsPgVdAw==
dependencies:
- hoist-non-react-statics "^2.3.1"
- prop-types "^15.6.0"
- react-lifecycles-compat "^3.0.4"
- shallowequal "^1.0.2"
+ loader-utils "^1.1.0"
+ normalize-url "^2.0.1"
+ schema-utils "^1.0.0"
+ webpack-sources "^1.1.0"
-minimalistic-assert@^1.0.0:
+minimalistic-assert@^1.0.0, minimalistic-assert@^1.0.1:
version "1.0.1"
- resolved "http://registry.npm.taobao.org/minimalistic-assert/download/minimalistic-assert-1.0.1.tgz#2e194de044626d4a10e7f7fbc00ce73e83e4d5c7"
+ resolved "https://registry.yarnpkg.com/minimalistic-assert/-/minimalistic-assert-1.0.1.tgz#2e194de044626d4a10e7f7fbc00ce73e83e4d5c7"
+ integrity sha512-UtJcAD4yEaGtjPezWuO9wC4nwUnVH/8/Im3yEHQP4b67cXlD/Qr9hdITCU1xDbSEXg2XKNaP8jsReV7vQd00/A==
minimalistic-crypto-utils@^1.0.0, minimalistic-crypto-utils@^1.0.1:
version "1.0.1"
- resolved "http://registry.npm.taobao.org/minimalistic-crypto-utils/download/minimalistic-crypto-utils-1.0.1.tgz#f6c00c1c0b082246e5c4d99dfb8c7c083b2b582a"
+ resolved "https://registry.yarnpkg.com/minimalistic-crypto-utils/-/minimalistic-crypto-utils-1.0.1.tgz#f6c00c1c0b082246e5c4d99dfb8c7c083b2b582a"
+ integrity sha1-9sAMHAsIIkblxNmd+4x8CDsrWCo=
-"minimatch@2 || 3", minimatch@^3.0.2, minimatch@^3.0.3, minimatch@^3.0.4, minimatch@~3.0.2:
+minimatch@^3.0.4:
version "3.0.4"
- resolved "http://registry.npm.taobao.org/minimatch/download/minimatch-3.0.4.tgz#5166e286457f03306064be5497e8dbb0c3d32083"
+ resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.0.4.tgz#5166e286457f03306064be5497e8dbb0c3d32083"
+ integrity sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==
dependencies:
brace-expansion "^1.1.7"
[email protected]:
- version "3.0.3"
- resolved "http://registry.npm.taobao.org/minimatch/download/minimatch-3.0.3.tgz#2a4e4090b96b2db06a9d7df01055a62a77c9b774"
- dependencies:
- brace-expansion "^1.0.0"
-
minimist-options@^3.0.1:
version "3.0.2"
- resolved "http://registry.npm.taobao.org/minimist-options/download/minimist-options-3.0.2.tgz#fba4c8191339e13ecf4d61beb03f070103f3d954"
+ resolved "https://registry.yarnpkg.com/minimist-options/-/minimist-options-3.0.2.tgz#fba4c8191339e13ecf4d61beb03f070103f3d954"
+ integrity sha512-FyBrT/d0d4+uiZRbqznPXqw3IpZZG3gl3wKWiX784FycUKVwBt0uLBFkQrtE4tZOrgo78nZp2jnKz3L65T5LdQ==
dependencies:
arrify "^1.0.1"
is-plain-obj "^1.1.0"
[email protected]:
version "0.0.8"
- resolved "http://registry.npm.taobao.org/minimist/download/minimist-0.0.8.tgz#857fcabfc3397d2625b8228262e86aa7a011b05d"
+ resolved "https://registry.yarnpkg.com/minimist/-/minimist-0.0.8.tgz#857fcabfc3397d2625b8228262e86aa7a011b05d"
+ integrity sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0=
[email protected], minimist@^1.1.0, minimist@^1.1.1, minimist@^1.1.3, minimist@^1.2.0:
[email protected], minimist@^1.1.1, minimist@^1.1.3, minimist@^1.2.0:
version "1.2.0"
- resolved "http://registry.npm.taobao.org/minimist/download/minimist-1.2.0.tgz#a35008b20f41383eec1fb914f4cd5df79a264284"
+ resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.0.tgz#a35008b20f41383eec1fb914f4cd5df79a264284"
+ integrity sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=
minimist@~0.0.1:
version "0.0.10"
- resolved "http://registry.npm.taobao.org/minimist/download/minimist-0.0.10.tgz#de3f98543dbf96082be48ad1a0c7cda836301dcf"
+ resolved "https://registry.yarnpkg.com/minimist/-/minimist-0.0.10.tgz#de3f98543dbf96082be48ad1a0c7cda836301dcf"
+ integrity sha1-3j+YVD2/lggr5IrRoMfNqDYwHc8=
-minipass@^2.2.1, minipass@^2.3.3:
- version "2.3.3"
- resolved "http://registry.npm.taobao.org/minipass/download/minipass-2.3.3.tgz#a7dcc8b7b833f5d368759cce544dccb55f50f233"
+minipass@^2.2.1, minipass@^2.3.5:
+ version "2.3.5"
+ resolved "https://registry.yarnpkg.com/minipass/-/minipass-2.3.5.tgz#cacebe492022497f656b0f0f51e2682a9ed2d848"
+ integrity sha512-Gi1W4k059gyRbyVUZQ4mEqLm0YIUiGYfvxhF6SIlk3ui1WVxMTGfGdQ2SInh3PDrRTVvPKgULkpJtT4RH10+VA==
dependencies:
safe-buffer "^5.1.2"
yallist "^3.0.0"
-minizlib@^1.1.0:
- version "1.1.0"
- resolved "http://registry.npm.taobao.org/minizlib/download/minizlib-1.1.0.tgz#11e13658ce46bc3a70a267aac58359d1e0c29ceb"
+minizlib@^1.2.1:
+ version "1.2.1"
+ resolved "https://registry.yarnpkg.com/minizlib/-/minizlib-1.2.1.tgz#dd27ea6136243c7c880684e8672bb3a45fd9b614"
+ integrity sha512-7+4oTUOWKg7AuL3vloEWekXY2/D20cevzsrNT2kGWm+39J9hGTCBv8VI5Pm5lXZ/o3/mdR4f8rflAPhnQb8mPA==
dependencies:
minipass "^2.2.1"
mississippi@^2.0.0:
version "2.0.0"
- resolved "http://registry.npm.taobao.org/mississippi/download/mississippi-2.0.0.tgz#3442a508fafc28500486feea99409676e4ee5a6f"
+ resolved "https://registry.yarnpkg.com/mississippi/-/mississippi-2.0.0.tgz#3442a508fafc28500486feea99409676e4ee5a6f"
+ integrity sha512-zHo8v+otD1J10j/tC+VNoGK9keCuByhKovAvdn74dmxJl9+mWHnx6EMsDN4lgRoMI/eYo2nchAxniIbUPb5onw==
dependencies:
concat-stream "^1.5.0"
duplexify "^3.4.2"
@@ -6172,42 +6429,46 @@ mississippi@^2.0.0:
stream-each "^1.1.0"
through2 "^2.0.0"
+mississippi@^3.0.0:
+ version "3.0.0"
+ resolved "https://registry.yarnpkg.com/mississippi/-/mississippi-3.0.0.tgz#ea0a3291f97e0b5e8776b363d5f0a12d94c67022"
+ integrity sha512-x471SsVjUtBRtcvd4BzKE9kFC+/2TeWgKCgw0bZcw1b9l2X3QX5vCWgF+KaZaYm87Ss//rHnWryupDrgLvmSkA==
+ dependencies:
+ concat-stream "^1.5.0"
+ duplexify "^3.4.2"
+ end-of-stream "^1.1.0"
+ flush-write-stream "^1.0.0"
+ from2 "^2.1.0"
+ parallel-transform "^1.1.0"
+ pump "^3.0.0"
+ pumpify "^1.3.3"
+ stream-each "^1.1.0"
+ through2 "^2.0.0"
+
mixin-deep@^1.2.0:
- version "1.3.1"
- resolved "http://registry.npm.taobao.org/mixin-deep/download/mixin-deep-1.3.1.tgz#a49e7268dce1a0d9698e45326c5626df3543d0fe"
+ version "1.3.2"
+ resolved "https://registry.yarnpkg.com/mixin-deep/-/mixin-deep-1.3.2.tgz#1120b43dc359a785dce65b55b82e257ccf479566"
+ integrity sha512-WRoDn//mXBiJ1H40rqa3vH0toePwSsGb45iInWlTySa+Uu4k3tYUSxa2v1KqAiLtvlrSzaExqS1gtk96A9zvEA==
dependencies:
for-in "^1.0.2"
is-extendable "^1.0.1"
-mixin-object@^2.0.1:
- version "2.0.1"
- resolved "http://registry.npm.taobao.org/mixin-object/download/mixin-object-2.0.1.tgz#4fb949441dab182540f1fe035ba60e1947a5e57e"
- dependencies:
- for-in "^0.1.3"
- is-extendable "^0.1.1"
-
[email protected], "mkdirp@>=0.5 0", mkdirp@^0.5.0, mkdirp@^0.5.1, mkdirp@~0.5.0, mkdirp@~0.5.1:
[email protected], mkdirp@^0.5.0, mkdirp@^0.5.1, mkdirp@~0.5.0:
version "0.5.1"
- resolved "http://registry.npm.taobao.org/mkdirp/download/mkdirp-0.5.1.tgz#30057438eac6cf7f8c4767f38648d6697d75c903"
+ resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.1.tgz#30057438eac6cf7f8c4767f38648d6697d75c903"
+ integrity sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=
dependencies:
minimist "0.0.8"
modify-values@^1.0.0:
version "1.0.1"
- resolved "http://registry.npm.taobao.org/modify-values/download/modify-values-1.0.1.tgz#b3939fa605546474e3e3e3c63d64bd43b4ee6022"
-
[email protected]:
- version "2.22.1"
- resolved "http://registry.npm.taobao.org/moment/download/moment-2.22.1.tgz#529a2e9bf973f259c9643d237fda84de3a26e8ad"
-
-moment@^2.19.3:
- version "2.23.0"
- resolved "http://registry.npm.taobao.org/moment/download/moment-2.23.0.tgz#759ea491ac97d54bac5ad776996e2a58cc1bc225"
- integrity sha1-dZ6kkayX1UusWtd2mW4qWMwbwiU=
+ resolved "https://registry.yarnpkg.com/modify-values/-/modify-values-1.0.1.tgz#b3939fa605546474e3e3e3c63d64bd43b4ee6022"
+ integrity sha512-xV2bxeN6F7oYjZWTe/YPAy6MN2M+sL4u/Rlm2AHCIVGfo2p1yGmBHQ6vHehl4bRTZBdHu3TSkWdYgkwpYzAGSw==
move-concurrently@^1.0.1:
version "1.0.1"
- resolved "http://registry.npm.taobao.org/move-concurrently/download/move-concurrently-1.0.1.tgz#be2c005fda32e0b29af1f05d7c4b33214c701f92"
+ resolved "https://registry.yarnpkg.com/move-concurrently/-/move-concurrently-1.0.1.tgz#be2c005fda32e0b29af1f05d7c4b33214c701f92"
+ integrity sha1-viwAX9oy4LKa8fBdfEszIUxwH5I=
dependencies:
aproba "^1.1.1"
copy-concurrently "^1.0.0"
@@ -6218,46 +6479,52 @@ move-concurrently@^1.0.1:
[email protected]:
version "2.0.0"
- resolved "http://registry.npm.taobao.org/ms/download/ms-2.0.0.tgz#5608aeadfc00be6c2901df5f9861788de0d597c8"
+ resolved "https://registry.yarnpkg.com/ms/-/ms-2.0.0.tgz#5608aeadfc00be6c2901df5f9861788de0d597c8"
+ integrity sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=
+
[email protected]:
+ version "2.1.1"
+ resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.1.tgz#30a5864eb3ebb0a66f2ebe6d727af06a09d86e0a"
+ integrity sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==
+
+ms@^2.1.1:
+ version "2.1.2"
+ resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.2.tgz#d09d1f357b443f493382a8eb3ccd183872ae6009"
+ integrity sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==
multicast-dns-service-types@^1.1.0:
version "1.1.0"
- resolved "http://registry.npm.taobao.org/multicast-dns-service-types/download/multicast-dns-service-types-1.1.0.tgz#899f11d9686e5e05cb91b35d5f0e63b773cfc901"
+ resolved "https://registry.yarnpkg.com/multicast-dns-service-types/-/multicast-dns-service-types-1.1.0.tgz#899f11d9686e5e05cb91b35d5f0e63b773cfc901"
+ integrity sha1-iZ8R2WhuXgXLkbNdXw5jt3PPyQE=
multicast-dns@^6.0.1:
version "6.2.3"
- resolved "http://registry.npm.taobao.org/multicast-dns/download/multicast-dns-6.2.3.tgz#a0ec7bd9055c4282f790c3c82f4e28db3b31b229"
+ resolved "https://registry.yarnpkg.com/multicast-dns/-/multicast-dns-6.2.3.tgz#a0ec7bd9055c4282f790c3c82f4e28db3b31b229"
+ integrity sha512-ji6J5enbMyGRHIAkAOu3WdV8nggqviKCEKtXcOqfphZZtQrmHKycfynJ2V7eVPUA4NhJ6V7Wf4TmGbTwKE9B6g==
dependencies:
dns-packet "^1.3.1"
thunky "^1.0.2"
-mutationobserver-shim@^0.3.2:
- version "0.3.3"
- resolved "http://registry.npm.taobao.org/mutationobserver-shim/download/mutationobserver-shim-0.3.3.tgz#65869630bc89d7bf8c9cd9cb82188cd955aacd2b"
- integrity sha1-ZYaWMLyJ17+MnNnLghiM2VWqzSs=
-
[email protected]:
- version "0.0.6"
- resolved "http://registry.npm.taobao.org/mute-stream/download/mute-stream-0.0.6.tgz#48962b19e169fd1dfc240b3f1e7317627bbc47db"
-
[email protected]:
version "0.0.7"
- resolved "http://registry.npm.taobao.org/mute-stream/download/mute-stream-0.0.7.tgz#3075ce93bc21b8fab43e1bc4da7e8115ed1e7bab"
+ resolved "https://registry.yarnpkg.com/mute-stream/-/mute-stream-0.0.7.tgz#3075ce93bc21b8fab43e1bc4da7e8115ed1e7bab"
+ integrity sha1-MHXOk7whuPq0PhvE2n6BFe0ee6s=
-nan@^2.10.0, nan@^2.9.2:
- version "2.10.0"
- resolved "http://registry.npm.taobao.org/nan/download/nan-2.10.0.tgz#96d0cd610ebd58d4b4de9cc0c6828cda99c7548f"
+nan@^2.12.1:
+ version "2.14.0"
+ resolved "https://registry.yarnpkg.com/nan/-/nan-2.14.0.tgz#7818f722027b2459a86f0295d434d1fc2336c52c"
+ integrity sha512-INOFj37C7k3AfaNTtX8RhsTw7qRy7eLET14cROi9+5HAVbbHuIWUHEauBv5qT4Av2tWasiTY1Jw6puUNqRJXQg==
nanomatch@^1.2.9:
- version "1.2.9"
- resolved "http://registry.npm.taobao.org/nanomatch/download/nanomatch-1.2.9.tgz#879f7150cb2dab7a471259066c104eee6e0fa7c2"
+ version "1.2.13"
+ resolved "https://registry.yarnpkg.com/nanomatch/-/nanomatch-1.2.13.tgz#b87a8aa4fc0de8fe6be88895b38983ff265bd119"
+ integrity sha512-fpoe2T0RbHwBTBUOftAfBPaDEi06ufaUai0mE6Yn1kacc3SnTErfb/h+X94VXzI64rKFHYImXSvdwGGCmwOqCA==
dependencies:
arr-diff "^4.0.0"
array-unique "^0.3.2"
define-property "^2.0.2"
extend-shallow "^3.0.2"
fragment-cache "^0.2.1"
- is-odd "^2.0.0"
is-windows "^1.0.2"
kind-of "^6.0.2"
object.pick "^1.3.0"
@@ -6267,106 +6534,88 @@ nanomatch@^1.2.9:
natural-compare@^1.4.0:
version "1.4.0"
- resolved "http://registry.npm.taobao.org/natural-compare/download/natural-compare-1.4.0.tgz#4abebfeed7541f2c27acfb29bdbbd15c8d5ba4f7"
+ resolved "https://registry.yarnpkg.com/natural-compare/-/natural-compare-1.4.0.tgz#4abebfeed7541f2c27acfb29bdbbd15c8d5ba4f7"
+ integrity sha1-Sr6/7tdUHywnrPspvbvRXI1bpPc=
-nearley@^2.7.10:
- version "2.13.0"
- resolved "http://registry.npm.taobao.org/nearley/download/nearley-2.13.0.tgz#6e7b0f4e68bfc3e74c99eaef2eda39e513143439"
- dependencies:
- nomnom "~1.6.2"
- railroad-diagrams "^1.0.0"
- randexp "0.4.6"
- semver "^5.4.1"
-
-needle@^2.2.0:
- version "2.2.1"
- resolved "http://registry.npm.taobao.org/needle/download/needle-2.2.1.tgz#b5e325bd3aae8c2678902fa296f729455d1d3a7d"
+needle@^2.2.1:
+ version "2.4.0"
+ resolved "https://registry.yarnpkg.com/needle/-/needle-2.4.0.tgz#6833e74975c444642590e15a750288c5f939b57c"
+ integrity sha512-4Hnwzr3mi5L97hMYeNl8wRW/Onhy4nUKR/lVemJ8gJedxxUyBLm9kkrDColJvoSfwi0jCNhD+xCdOtiGDQiRZg==
dependencies:
- debug "^2.1.2"
+ debug "^3.2.6"
iconv-lite "^0.4.4"
sax "^1.2.4"
[email protected]:
- version "0.6.1"
- resolved "http://registry.npm.taobao.org/negotiator/download/negotiator-0.6.1.tgz#2b327184e8992101177b28563fb5e7102acd0ca9"
[email protected]:
+ version "0.6.2"
+ resolved "https://registry.yarnpkg.com/negotiator/-/negotiator-0.6.2.tgz#feacf7ccf525a77ae9634436a64883ffeca346fb"
+ integrity sha512-hZXc7K2e+PgeI1eDBe/10Ard4ekbfrrqG8Ep+8Jmf4JID2bNg7NvCPOZN+kfF574pFQI7mum2AUqDidoKqcTOw==
-neo-async@^2.5.0:
- version "2.5.1"
- resolved "http://registry.npm.taobao.org/neo-async/download/neo-async-2.5.1.tgz#acb909e327b1e87ec9ef15f41b8a269512ad41ee"
+neo-async@^2.5.0, neo-async@^2.6.0:
+ version "2.6.1"
+ resolved "https://registry.yarnpkg.com/neo-async/-/neo-async-2.6.1.tgz#ac27ada66167fa8849a6addd837f6b189ad2081c"
+ integrity sha512-iyam8fBuCUpWeKPGpaNMetEocMt364qkCsfL9JuhjXX6dRnguRVOfk2GZaDpPjcOKiiXCPINZC1GczQ7iTq3Zw==
-next-tick@1:
- version "1.0.0"
- resolved "http://registry.npm.taobao.org/next-tick/download/next-tick-1.0.0.tgz#ca86d1fe8828169b0120208e3dc8424b9db8342c"
+neutrino-webextension@^0.1.1:
+ version "0.1.1"
+ resolved "https://registry.yarnpkg.com/neutrino-webextension/-/neutrino-webextension-0.1.1.tgz#6f2dd514163f7e35485df6cceeb1fa154a3a6df0"
+ integrity sha512-eNuQ5e3i/w7hR3x5p3n71mAsAJJu4rRy8rfjPcHQ6Eq7Dbw0DoWC0bgt09vM+xF4Nh8FkB0w1VRdaU7ACWKPug==
+ dependencies:
+ archiver "^3.0.0"
+ deepmerge "^3.3.0"
+ fs-extra "^8.0.1"
+ globby "^10.0.1"
+ sinon-chrome "^3.0.1"
+ webextensions-emulator "^2.0.0"
+ yargs-parser "^13.1.1"
+
+neutrino@^9.0.0-rc.3:
+ version "9.0.0-rc.3"
+ resolved "https://registry.yarnpkg.com/neutrino/-/neutrino-9.0.0-rc.3.tgz#3428c0f3c0e77d121a43d6cecb2da2cd70712990"
+ integrity sha512-B6F0I8jttqMb45o9xGq8Iue11RG3oWXHDF6/5iCDYfocHIQ4PrcChnyKnriL7xyrYq0pVzcWINIEahp55VAsYQ==
+ dependencies:
+ lodash.clonedeep "^4.5.0"
+ semver "^6.0.0"
+ webpack-chain "^6.0.0"
+ yargs-parser "^13.0.0"
nice-try@^1.0.4:
version "1.0.5"
resolved "https://registry.yarnpkg.com/nice-try/-/nice-try-1.0.5.tgz#a3378a7696ce7d223e88fc9b764bd7ef1089e366"
integrity sha512-1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ==
-nise@^1.2.0:
- version "1.3.3"
- resolved "http://registry.npm.taobao.org/nise/download/nise-1.3.3.tgz#c17a850066a8a1dfeb37f921da02441afc4a82ba"
+nise@^1.4.10:
+ version "1.5.0"
+ resolved "https://registry.yarnpkg.com/nise/-/nise-1.5.0.tgz#d03ea0e6c1b75c638015aa3585eddc132949a50d"
+ integrity sha512-Z3sfYEkLFzFmL8KY6xnSJLRxwQwYBjOXi/24lb62ZnZiGA0JUzGGTI6TBIgfCSMIDl9Jlu8SRmHNACLTemDHww==
dependencies:
- "@sinonjs/formatio" "^2.0.0"
- just-extend "^1.1.27"
- lolex "^2.3.2"
+ "@sinonjs/formatio" "^3.1.0"
+ "@sinonjs/text-encoding" "^0.7.1"
+ just-extend "^4.0.2"
+ lolex "^4.1.0"
path-to-regexp "^1.7.0"
- text-encoding "^0.6.4"
no-case@^2.2.0:
version "2.3.2"
- resolved "http://registry.npm.taobao.org/no-case/download/no-case-2.3.2.tgz#60b813396be39b3f1288a4c1ed5d1e7d28b464ac"
+ resolved "https://registry.yarnpkg.com/no-case/-/no-case-2.3.2.tgz#60b813396be39b3f1288a4c1ed5d1e7d28b464ac"
+ integrity sha512-rmTZ9kz+f3rCvK2TD1Ue/oZlns7OGoIWP4fc3llxxRXlOkHKoWPPWJOfFYpITabSow43QJbRIoHQXtt10VldyQ==
dependencies:
lower-case "^1.1.1"
[email protected]:
- version "1.6.3"
- resolved "http://registry.npm.taobao.org/node-fetch/download/node-fetch-1.6.3.tgz#dc234edd6489982d58e8f0db4f695029abcd8c04"
- dependencies:
- encoding "^0.1.11"
- is-stream "^1.0.1"
-
-node-fetch@^1.0.1:
- version "1.7.3"
- resolved "http://registry.npm.taobao.org/node-fetch/download/node-fetch-1.7.3.tgz#980f6f72d85211a5347c6b2bc18c5b84c3eb47ef"
- dependencies:
- encoding "^0.1.11"
- is-stream "^1.0.1"
-
-node-fetch@^2.3.0:
- version "2.3.0"
- resolved "http://registry.npm.taobao.org/node-fetch/download/node-fetch-2.3.0.tgz#1a1d940bbfb916a1d3e0219f037e89e71f8c5fa5"
- integrity sha1-Gh2UC7+5FqHT4CGfA36J5x+MX6U=
-
[email protected]:
version "0.7.5"
- resolved "http://registry.npm.taobao.org/node-forge/download/node-forge-0.7.5.tgz#6c152c345ce11c52f465c2abd957e8639cd674df"
-
-node-gyp@^3.3.1:
- version "3.6.2"
- resolved "http://registry.npm.taobao.org/node-gyp/download/node-gyp-3.6.2.tgz#9bfbe54562286284838e750eac05295853fa1c60"
- dependencies:
- fstream "^1.0.0"
- glob "^7.0.3"
- graceful-fs "^4.1.2"
- minimatch "^3.0.2"
- mkdirp "^0.5.0"
- nopt "2 || 3"
- npmlog "0 || 1 || 2 || 3 || 4"
- osenv "0"
- request "2"
- rimraf "2"
- semver "~5.3.0"
- tar "^2.0.0"
- which "1"
+ resolved "https://registry.yarnpkg.com/node-forge/-/node-forge-0.7.5.tgz#6c152c345ce11c52f465c2abd957e8639cd674df"
+ integrity sha512-MmbQJ2MTESTjt3Gi/3yG1wGpIMhUfcIypUCGtTizFR9IiccFwxSpfp0vtIZlkFclEqERemxfnSdZEMR9VqqEFQ==
node-int64@^0.4.0:
version "0.4.0"
- resolved "http://registry.npm.taobao.org/node-int64/download/node-int64-0.4.0.tgz#87a9065cdb355d3182d8f94ce11188b825c68a3b"
+ resolved "https://registry.yarnpkg.com/node-int64/-/node-int64-0.4.0.tgz#87a9065cdb355d3182d8f94ce11188b825c68a3b"
+ integrity sha1-h6kGXNs1XTGC2PlM4RGIuCXGijs=
node-libs-browser@^2.0.0:
- version "2.1.0"
- resolved "http://registry.npm.taobao.org/node-libs-browser/download/node-libs-browser-2.1.0.tgz#5f94263d404f6e44767d726901fff05478d600df"
+ version "2.2.1"
+ resolved "https://registry.yarnpkg.com/node-libs-browser/-/node-libs-browser-2.2.1.tgz#b64f513d18338625f90346d27b0d235e631f6425"
+ integrity sha512-h/zcD8H9kaDZ9ALUWwlBUDo6TKF8a7qBSCSEGfjTVIYeqsioSKaAX+BN7NgiMGp6iSIXZ3PxgCu8KS3b71YK5Q==
dependencies:
assert "^1.1.1"
browserify-zlib "^0.2.0"
@@ -6375,10 +6624,10 @@ node-libs-browser@^2.0.0:
constants-browserify "^1.0.0"
crypto-browserify "^3.11.0"
domain-browser "^1.1.1"
- events "^1.0.0"
+ events "^3.0.0"
https-browserify "^1.0.0"
os-browserify "^0.3.0"
- path-browserify "0.0.0"
+ path-browserify "0.0.1"
process "^0.11.10"
punycode "^1.2.4"
querystring-es3 "^0.2.0"
@@ -6389,129 +6638,111 @@ node-libs-browser@^2.0.0:
timers-browserify "^2.0.4"
tty-browserify "0.0.0"
url "^0.11.0"
- util "^0.10.3"
- vm-browserify "0.0.4"
+ util "^0.11.0"
+ vm-browserify "^1.0.1"
+
+node-modules-regexp@^1.0.0:
+ version "1.0.0"
+ resolved "https://registry.yarnpkg.com/node-modules-regexp/-/node-modules-regexp-1.0.0.tgz#8d9dbe28964a4ac5712e9131642107c71e90ec40"
+ integrity sha1-jZ2+KJZKSsVxLpExZCEHxx6Q7EA=
node-notifier@^5.2.1:
- version "5.2.1"
- resolved "http://registry.npm.taobao.org/node-notifier/download/node-notifier-5.2.1.tgz#fa313dd08f5517db0e2502e5758d664ac69f9dea"
+ version "5.4.0"
+ resolved "https://registry.yarnpkg.com/node-notifier/-/node-notifier-5.4.0.tgz#7b455fdce9f7de0c63538297354f3db468426e6a"
+ integrity sha512-SUDEb+o71XR5lXSTyivXd9J7fCloE3SyP4lSgt3lU2oSANiox+SxlNRGPjDKrwU1YN3ix2KN/VGGCg0t01rttQ==
dependencies:
growly "^1.3.0"
- semver "^5.4.1"
+ is-wsl "^1.1.0"
+ semver "^5.5.0"
shellwords "^0.1.1"
which "^1.3.0"
-node-pre-gyp@^0.10.0:
- version "0.10.0"
- resolved "http://registry.npm.taobao.org/node-pre-gyp/download/node-pre-gyp-0.10.0.tgz#6e4ef5bb5c5203c6552448828c852c40111aac46"
+node-pre-gyp@^0.12.0:
+ version "0.12.0"
+ resolved "https://registry.yarnpkg.com/node-pre-gyp/-/node-pre-gyp-0.12.0.tgz#39ba4bb1439da030295f899e3b520b7785766149"
+ integrity sha512-4KghwV8vH5k+g2ylT+sLTjy5wmUOb9vPhnM8NHvRf9dHmnW/CndrFXy2aRPaPST6dugXSdHXfeaHQm77PIz/1A==
dependencies:
detect-libc "^1.0.2"
mkdirp "^0.5.1"
- needle "^2.2.0"
+ needle "^2.2.1"
nopt "^4.0.1"
npm-packlist "^1.1.6"
npmlog "^4.0.2"
- rc "^1.1.7"
+ rc "^1.2.7"
rimraf "^2.6.1"
semver "^5.3.0"
tar "^4"
-node-sass@^4.7.2:
- version "4.9.0"
- resolved "http://registry.npm.taobao.org/node-sass/download/node-sass-4.9.0.tgz#d1b8aa855d98ed684d6848db929a20771cc2ae52"
- dependencies:
- async-foreach "^0.1.3"
- chalk "^1.1.1"
- cross-spawn "^3.0.0"
- gaze "^1.0.0"
- get-stdin "^4.0.1"
- glob "^7.0.3"
- in-publish "^2.0.0"
- lodash.assign "^4.2.0"
- lodash.clonedeep "^4.3.2"
- lodash.mergewith "^4.6.0"
- meow "^3.7.0"
- mkdirp "^0.5.1"
- nan "^2.10.0"
- node-gyp "^3.3.1"
- npmlog "^4.0.0"
- request "~2.79.0"
- sass-graph "^2.2.4"
- stdout-stream "^1.4.0"
- "true-case-path" "^1.0.2"
-
-nomnom@~1.6.2:
- version "1.6.2"
- resolved "http://registry.npm.taobao.org/nomnom/download/nomnom-1.6.2.tgz#84a66a260174408fc5b77a18f888eccc44fb6971"
- dependencies:
- colors "0.5.x"
- underscore "~1.4.4"
-
-"nopt@2 || 3":
- version "3.0.6"
- resolved "http://registry.npm.taobao.org/nopt/download/nopt-3.0.6.tgz#c6465dbf08abcd4db359317f79ac68a646b28ff9"
+node-releases@^1.1.23:
+ version "1.1.25"
+ resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-1.1.25.tgz#0c2d7dbc7fed30fbe02a9ee3007b8c90bf0133d3"
+ integrity sha512-fI5BXuk83lKEoZDdH3gRhtsNgh05/wZacuXkgbiYkceE7+QIMXOg98n9ZV7mz27B+kFHnqHcUpscZZlGRSmTpQ==
dependencies:
- abbrev "1"
+ semver "^5.3.0"
nopt@^4.0.1:
version "4.0.1"
- resolved "http://registry.npm.taobao.org/nopt/download/nopt-4.0.1.tgz#d0d4685afd5415193c8c7505602d0d17cd64474d"
+ resolved "https://registry.yarnpkg.com/nopt/-/nopt-4.0.1.tgz#d0d4685afd5415193c8c7505602d0d17cd64474d"
+ integrity sha1-0NRoWv1UFRk8jHUFYC0NF81kR00=
dependencies:
abbrev "1"
osenv "^0.1.4"
-normalize-package-data@^2.3.0, normalize-package-data@^2.3.2, normalize-package-data@^2.3.4, normalize-package-data@^2.3.5:
- version "2.4.0"
- resolved "http://registry.npm.taobao.org/normalize-package-data/download/normalize-package-data-2.4.0.tgz#12f95a307d58352075a04907b84ac8be98ac012f"
+normalize-package-data@^2.3.0, normalize-package-data@^2.3.2, normalize-package-data@^2.3.4, normalize-package-data@^2.3.5, normalize-package-data@^2.5.0:
+ version "2.5.0"
+ resolved "https://registry.yarnpkg.com/normalize-package-data/-/normalize-package-data-2.5.0.tgz#e66db1838b200c1dfc233225d12cb36520e234a8"
+ integrity sha512-/5CMN3T0R4XTj4DcGaexo+roZSdSFW/0AOOTROrjxzCG1wrWXEsGbRKevjlIL+ZDE4sZlJr5ED4YW0yqmkK+eA==
dependencies:
hosted-git-info "^2.1.4"
- is-builtin-module "^1.0.0"
+ resolve "^1.10.0"
semver "2 || 3 || 4 || 5"
validate-npm-package-license "^3.0.1"
-normalize-path@^2.0.0, normalize-path@^2.0.1, normalize-path@^2.1.1:
+normalize-path@^2.0.0, normalize-path@^2.1.1:
version "2.1.1"
- resolved "http://registry.npm.taobao.org/normalize-path/download/normalize-path-2.1.1.tgz#1ab28b556e198363a8c1a6f7e6fa20137fe6aed9"
+ resolved "https://registry.yarnpkg.com/normalize-path/-/normalize-path-2.1.1.tgz#1ab28b556e198363a8c1a6f7e6fa20137fe6aed9"
+ integrity sha1-GrKLVW4Zg2Oowab35vogE3/mrtk=
dependencies:
remove-trailing-separator "^1.0.1"
-normalize-range@^0.1.2:
- version "0.1.2"
- resolved "http://registry.npm.taobao.org/normalize-range/download/normalize-range-0.1.2.tgz#2d10c06bdfd312ea9777695a4d28439456b75942"
-
-normalize-scss@^7.0.1:
- version "7.0.1"
- resolved "http://registry.npm.taobao.org/normalize-scss/download/normalize-scss-7.0.1.tgz#74485e82bb5d0526371136422a09fdb868ffc1a4"
+normalize-path@^3.0.0:
+ version "3.0.0"
+ resolved "https://registry.yarnpkg.com/normalize-path/-/normalize-path-3.0.0.tgz#0dcd69ff23a1c9b11fd0978316644a0388216a65"
+ integrity sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==
-normalize-url@^1.4.0:
- version "1.9.1"
- resolved "http://registry.npm.taobao.org/normalize-url/download/normalize-url-1.9.1.tgz#2cc0d66b31ea23036458436e3620d85954c66c3c"
+normalize-url@^2.0.1:
+ version "2.0.1"
+ resolved "https://registry.yarnpkg.com/normalize-url/-/normalize-url-2.0.1.tgz#835a9da1551fa26f70e92329069a23aa6574d7e6"
+ integrity sha512-D6MUW4K/VzoJ4rJ01JFKxDrtY1v9wrgzCX5f2qj/lzH1m/lW6MhUZFKerVsnyjOhOsYzI9Kqqak+10l4LvLpMw==
dependencies:
- object-assign "^4.0.1"
- prepend-http "^1.0.0"
- query-string "^4.1.0"
- sort-keys "^1.0.0"
+ prepend-http "^2.0.0"
+ query-string "^5.0.1"
+ sort-keys "^2.0.0"
npm-bundled@^1.0.1:
- version "1.0.3"
- resolved "http://registry.npm.taobao.org/npm-bundled/download/npm-bundled-1.0.3.tgz#7e71703d973af3370a9591bafe3a63aca0be2308"
+ version "1.0.6"
+ resolved "https://registry.yarnpkg.com/npm-bundled/-/npm-bundled-1.0.6.tgz#e7ba9aadcef962bb61248f91721cd932b3fe6bdd"
+ integrity sha512-8/JCaftHwbd//k6y2rEWp6k1wxVfpFzB6t1p825+cUb7Ym2XQfhwIC5KwhrvzZRJu+LtDE585zVaS32+CGtf0g==
npm-packlist@^1.1.6:
- version "1.1.10"
- resolved "http://registry.npm.taobao.org/npm-packlist/download/npm-packlist-1.1.10.tgz#1039db9e985727e464df066f4cf0ab6ef85c398a"
+ version "1.4.4"
+ resolved "https://registry.yarnpkg.com/npm-packlist/-/npm-packlist-1.4.4.tgz#866224233850ac534b63d1a6e76050092b5d2f44"
+ integrity sha512-zTLo8UcVYtDU3gdeaFu2Xu0n0EvelfHDGuqtNIn5RO7yQj4H1TqNdBc/yZjxnWA0PVB8D3Woyp0i5B43JwQ6Vw==
dependencies:
ignore-walk "^3.0.1"
npm-bundled "^1.0.1"
npm-run-path@^2.0.0:
version "2.0.2"
- resolved "http://registry.npm.taobao.org/npm-run-path/download/npm-run-path-2.0.2.tgz#35a9232dfa35d7067b4cb2ddf2357b1871536c5f"
+ resolved "https://registry.yarnpkg.com/npm-run-path/-/npm-run-path-2.0.2.tgz#35a9232dfa35d7067b4cb2ddf2357b1871536c5f"
+ integrity sha1-NakjLfo11wZ7TLLd8jV7GHFTbF8=
dependencies:
path-key "^2.0.0"
-"npmlog@0 || 1 || 2 || 3 || 4", npmlog@^4.0.0, npmlog@^4.0.2:
+npmlog@^4.0.2:
version "4.1.2"
- resolved "http://registry.npm.taobao.org/npmlog/download/npmlog-4.1.2.tgz#08a7f2a8bf734604779a9efa4ad5cc717abb954b"
+ resolved "https://registry.yarnpkg.com/npmlog/-/npmlog-4.1.2.tgz#08a7f2a8bf734604779a9efa4ad5cc717abb954b"
+ integrity sha512-2uUqazuKlTaSI/dC8AzicUck7+IrEaOnN/e0jd3Xtt1KcGpwx30v50mL7oPyr/h9bL3E4aZccVwpwP+5W9Vjkg==
dependencies:
are-we-there-yet "~1.1.2"
console-control-strings "~1.1.0"
@@ -6519,192 +6750,175 @@ npm-run-path@^2.0.0:
set-blocking "~2.0.0"
nth-check@~1.0.1:
- version "1.0.1"
- resolved "http://registry.npm.taobao.org/nth-check/download/nth-check-1.0.1.tgz#9929acdf628fc2c41098deab82ac580cf149aae4"
+ version "1.0.2"
+ resolved "https://registry.yarnpkg.com/nth-check/-/nth-check-1.0.2.tgz#b2bd295c37e3dd58a3bf0700376663ba4d9cf05c"
+ integrity sha512-WeBOdju8SnzPN5vTUJYxYUxLeXpCaVP5i5e0LF8fg7WORF2Wd7wFX/pk0tYZk7s8T+J7VLy0Da6J1+wCT0AtHg==
dependencies:
boolbase "~1.0.0"
null-check@^1.0.0:
version "1.0.0"
- resolved "http://registry.npm.taobao.org/null-check/download/null-check-1.0.0.tgz#977dffd7176012b9ec30d2a39db5cf72a0439edd"
-
-num2fraction@^1.2.2:
- version "1.2.2"
- resolved "http://registry.npm.taobao.org/num2fraction/download/num2fraction-1.2.2.tgz#6f682b6a027a4e9ddfa4564cd2589d1d4e669ede"
+ resolved "https://registry.yarnpkg.com/null-check/-/null-check-1.0.0.tgz#977dffd7176012b9ec30d2a39db5cf72a0439edd"
+ integrity sha1-l33/1xdgErnsMNKjnbXPcqBDnt0=
number-is-nan@^1.0.0:
version "1.0.1"
- resolved "http://registry.npm.taobao.org/number-is-nan/download/number-is-nan-1.0.1.tgz#097b602b53422a522c1afb8790318336941a011d"
+ resolved "https://registry.yarnpkg.com/number-is-nan/-/number-is-nan-1.0.1.tgz#097b602b53422a522c1afb8790318336941a011d"
+ integrity sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0=
-nwsapi@^2.0.0:
- version "2.0.1"
- resolved "http://registry.npm.taobao.org/nwsapi/download/nwsapi-2.0.1.tgz#a50d59a2dcb14b6931401171713ced2d0eb3468f"
+nwsapi@^2.0.7:
+ version "2.1.4"
+ resolved "https://registry.yarnpkg.com/nwsapi/-/nwsapi-2.1.4.tgz#e006a878db23636f8e8a67d33ca0e4edf61a842f"
+ integrity sha512-iGfd9Y6SFdTNldEy2L0GUhcarIutFmk+MPWIn9dmj8NMIup03G08uUF2KGbbmv/Ux4RT0VZJoP/sVbWA6d/VIw==
-oauth-sign@~0.8.1, oauth-sign@~0.8.2:
- version "0.8.2"
- resolved "http://registry.npm.taobao.org/oauth-sign/download/oauth-sign-0.8.2.tgz#46a6ab7f0aead8deae9ec0565780b7d4efeb9d43"
+oauth-sign@~0.9.0:
+ version "0.9.0"
+ resolved "https://registry.yarnpkg.com/oauth-sign/-/oauth-sign-0.9.0.tgz#47a7b016baa68b5fa0ecf3dee08a85c679ac6455"
+ integrity sha512-fexhUFFPTGV8ybAtSIGbV6gOkSv8UtRbDBnAyLQw4QPKkgNlsH2ByPGtMUqdWkos6YCRmAqViwgZrJc/mRDzZQ==
[email protected], object-assign@^4.0.1, object-assign@^4.1.0, object-assign@^4.1.1:
+object-assign@^4.0.1, object-assign@^4.1.0, object-assign@^4.1.1:
version "4.1.1"
- resolved "http://registry.npm.taobao.org/object-assign/download/object-assign-4.1.1.tgz#2109adc7965887cfc05cbbd442cac8bfbb360863"
-
-object-assign@^3.0.0:
- version "3.0.0"
- resolved "http://registry.npm.taobao.org/object-assign/download/object-assign-3.0.0.tgz#9bedd5ca0897949bca47e7ff408062d549f587f2"
+ resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-4.1.1.tgz#2109adc7965887cfc05cbbd442cac8bfbb360863"
+ integrity sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=
object-copy@^0.1.0:
version "0.1.0"
- resolved "http://registry.npm.taobao.org/object-copy/download/object-copy-0.1.0.tgz#7e7d858b781bd7c991a41ba975ed3812754e998c"
+ resolved "https://registry.yarnpkg.com/object-copy/-/object-copy-0.1.0.tgz#7e7d858b781bd7c991a41ba975ed3812754e998c"
+ integrity sha1-fn2Fi3gb18mRpBupde04EnVOmYw=
dependencies:
copy-descriptor "^0.1.0"
define-property "^0.2.5"
kind-of "^3.0.3"
-object-inspect@^1.5.0:
- version "1.6.0"
- resolved "http://registry.npm.taobao.org/object-inspect/download/object-inspect-1.6.0.tgz#c70b6cbf72f274aab4c34c0c82f5167bf82cf15b"
-
-object-is@^1.0.1:
- version "1.0.1"
- resolved "http://registry.npm.taobao.org/object-is/download/object-is-1.0.1.tgz#0aa60ec9989a0b3ed795cf4d06f62cf1ad6539b6"
-
-object-keys@^1.0.11, object-keys@^1.0.8:
- version "1.0.11"
- resolved "http://registry.npm.taobao.org/object-keys/download/object-keys-1.0.11.tgz#c54601778ad560f1142ce0e01bcca8b56d13426d"
+object-keys@^1.0.11, object-keys@^1.0.12:
+ version "1.1.1"
+ resolved "https://registry.yarnpkg.com/object-keys/-/object-keys-1.1.1.tgz#1c47f272df277f3b1daf061677d9c82e2322c60e"
+ integrity sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==
object-visit@^1.0.0:
version "1.0.1"
- resolved "http://registry.npm.taobao.org/object-visit/download/object-visit-1.0.1.tgz#f79c4493af0c5377b59fe39d395e41042dd045bb"
+ resolved "https://registry.yarnpkg.com/object-visit/-/object-visit-1.0.1.tgz#f79c4493af0c5377b59fe39d395e41042dd045bb"
+ integrity sha1-95xEk68MU3e1n+OdOV5BBC3QRbs=
dependencies:
isobject "^3.0.0"
-object.assign@^4.0.4, object.assign@^4.1.0:
+object.assign@^4.1.0:
version "4.1.0"
- resolved "http://registry.npm.taobao.org/object.assign/download/object.assign-4.1.0.tgz#968bf1100d7956bb3ca086f006f846b3bc4008da"
+ resolved "https://registry.yarnpkg.com/object.assign/-/object.assign-4.1.0.tgz#968bf1100d7956bb3ca086f006f846b3bc4008da"
+ integrity sha512-exHJeq6kBKj58mqGyTQ9DFvrZC/eR6OwxzoM9YRoGBqrXYonaFyGiFMuc9VZrXf7DarreEwMpurG3dd+CNyW5w==
dependencies:
define-properties "^1.1.2"
function-bind "^1.1.1"
has-symbols "^1.0.0"
object-keys "^1.0.11"
-object.entries@^1.0.4:
- version "1.0.4"
- resolved "http://registry.npm.taobao.org/object.entries/download/object.entries-1.0.4.tgz#1bf9a4dd2288f5b33f3a993d257661f05d161a5f"
+object.entries@^1.1.0:
+ version "1.1.0"
+ resolved "https://registry.yarnpkg.com/object.entries/-/object.entries-1.1.0.tgz#2024fc6d6ba246aee38bdb0ffd5cfbcf371b7519"
+ integrity sha512-l+H6EQ8qzGRxbkHOd5I/aHRhHDKoQXQ8g0BYt4uSweQU1/J6dZUOyWh9a2Vky35YCKjzmgxOzta2hH6kf9HuXA==
+ dependencies:
+ define-properties "^1.1.3"
+ es-abstract "^1.12.0"
+ function-bind "^1.1.1"
+ has "^1.0.3"
+
+object.fromentries@^2.0.0:
+ version "2.0.0"
+ resolved "https://registry.yarnpkg.com/object.fromentries/-/object.fromentries-2.0.0.tgz#49a543d92151f8277b3ac9600f1e930b189d30ab"
+ integrity sha512-9iLiI6H083uiqUuvzyY6qrlmc/Gz8hLQFOcb/Ri/0xXFkSNS3ctV+CbE6yM2+AnkYfOB3dGjdzC0wrMLIhQICA==
dependencies:
define-properties "^1.1.2"
- es-abstract "^1.6.1"
- function-bind "^1.1.0"
+ es-abstract "^1.11.0"
+ function-bind "^1.1.1"
has "^1.0.1"
object.getownpropertydescriptors@^2.0.3:
version "2.0.3"
- resolved "http://registry.npm.taobao.org/object.getownpropertydescriptors/download/object.getownpropertydescriptors-2.0.3.tgz#8758c846f5b407adab0f236e0986f14b051caa16"
+ resolved "https://registry.yarnpkg.com/object.getownpropertydescriptors/-/object.getownpropertydescriptors-2.0.3.tgz#8758c846f5b407adab0f236e0986f14b051caa16"
+ integrity sha1-h1jIRvW0B62rDyNuCYbxSwUcqhY=
dependencies:
define-properties "^1.1.2"
es-abstract "^1.5.1"
-object.omit@^2.0.0:
- version "2.0.1"
- resolved "http://registry.npm.taobao.org/object.omit/download/object.omit-2.0.1.tgz#1a9c744829f39dbb858c76ca3579ae2a54ebd1fa"
+object.omit@^3.0.0:
+ version "3.0.0"
+ resolved "https://registry.yarnpkg.com/object.omit/-/object.omit-3.0.0.tgz#0e3edc2fce2ba54df5577ff529f6d97bd8a522af"
+ integrity sha512-EO+BCv6LJfu+gBIF3ggLicFebFLN5zqzz/WWJlMFfkMyGth+oBkhxzDl0wx2W4GkLzuQs/FsSkXZb2IMWQqmBQ==
dependencies:
- for-own "^0.1.4"
- is-extendable "^0.1.1"
+ is-extendable "^1.0.0"
object.pick@^1.3.0:
version "1.3.0"
- resolved "http://registry.npm.taobao.org/object.pick/download/object.pick-1.3.0.tgz#87a10ac4c1694bd2e1cbf53591a66141fb5dd747"
+ resolved "https://registry.yarnpkg.com/object.pick/-/object.pick-1.3.0.tgz#87a10ac4c1694bd2e1cbf53591a66141fb5dd747"
+ integrity sha1-h6EKxMFpS9Lhy/U1kaZhQftd10c=
dependencies:
isobject "^3.0.1"
-object.values@^1.0.4:
- version "1.0.4"
- resolved "http://registry.npm.taobao.org/object.values/download/object.values-1.0.4.tgz#e524da09b4f66ff05df457546ec72ac99f13069a"
+object.values@^1.1.0:
+ version "1.1.0"
+ resolved "https://registry.yarnpkg.com/object.values/-/object.values-1.1.0.tgz#bf6810ef5da3e5325790eaaa2be213ea84624da9"
+ integrity sha512-8mf0nKLAoFX6VlNVdhGj31SVYpaNFtUnuoOXWyFEstsWRgU837AK+JYM0iAxwkSzGRbwn8cbFmgbyxj1j4VbXg==
dependencies:
- define-properties "^1.1.2"
- es-abstract "^1.6.1"
- function-bind "^1.1.0"
- has "^1.0.1"
+ define-properties "^1.1.3"
+ es-abstract "^1.12.0"
+ function-bind "^1.1.1"
+ has "^1.0.3"
-obuf@^1.0.0, obuf@^1.1.1:
+obuf@^1.0.0, obuf@^1.1.2:
version "1.1.2"
- resolved "http://registry.npm.taobao.org/obuf/download/obuf-1.1.2.tgz#09bea3343d41859ebd446292d11c9d4db619084e"
-
-omit.js@^1.0.0:
- version "1.0.0"
- resolved "http://registry.npm.taobao.org/omit.js/download/omit.js-1.0.0.tgz#e013cb86a7517b9cf6f7cfb0ddb4297256a99288"
- dependencies:
- babel-runtime "^6.23.0"
+ resolved "https://registry.yarnpkg.com/obuf/-/obuf-1.1.2.tgz#09bea3343d41859ebd446292d11c9d4db619084e"
+ integrity sha512-PX1wu0AmAdPqOL1mWhqmlOd8kOIZQwGZw6rh7uby9fTc5lhaOWFLX3I6R1hrF9k3zUY40e6igsLGkDXK92LJNg==
on-finished@~2.3.0:
version "2.3.0"
- resolved "http://registry.npm.taobao.org/on-finished/download/on-finished-2.3.0.tgz#20f1336481b083cd75337992a16971aa2d906947"
+ resolved "https://registry.yarnpkg.com/on-finished/-/on-finished-2.3.0.tgz#20f1336481b083cd75337992a16971aa2d906947"
+ integrity sha1-IPEzZIGwg811M3mSoWlxqi2QaUc=
dependencies:
ee-first "1.1.1"
-on-headers@~1.0.1:
- version "1.0.1"
- resolved "http://registry.npm.taobao.org/on-headers/download/on-headers-1.0.1.tgz#928f5d0f470d49342651ea6794b0857c100693f7"
+on-headers@~1.0.2:
+ version "1.0.2"
+ resolved "https://registry.yarnpkg.com/on-headers/-/on-headers-1.0.2.tgz#772b0ae6aaa525c399e489adfad90c403eb3c28f"
+ integrity sha512-pZAE+FJLoyITytdqK0U5s+FIpjN0JP3OzFi/u8Rx+EV5/W+JTWGXG8xFzevE7AjBfDqHv/8vL8qQsIhHnqRkrA==
once@^1.3.0, once@^1.3.1, once@^1.4.0:
version "1.4.0"
- resolved "http://registry.npm.taobao.org/once/download/once-1.4.0.tgz#583b1aa775961d4b113ac17d9c50baef9dd76bd1"
+ resolved "https://registry.yarnpkg.com/once/-/once-1.4.0.tgz#583b1aa775961d4b113ac17d9c50baef9dd76bd1"
+ integrity sha1-WDsap3WWHUsROsF9nFC6753Xa9E=
dependencies:
wrappy "1"
-onetime@^1.0.0:
- version "1.1.0"
- resolved "http://registry.npm.taobao.org/onetime/download/onetime-1.1.0.tgz#a1f7838f8314c516f05ecefcbc4ccfe04b4ed789"
-
onetime@^2.0.0:
version "2.0.1"
- resolved "http://registry.npm.taobao.org/onetime/download/onetime-2.0.1.tgz#067428230fd67443b2794b22bba528b6867962d4"
+ resolved "https://registry.yarnpkg.com/onetime/-/onetime-2.0.1.tgz#067428230fd67443b2794b22bba528b6867962d4"
+ integrity sha1-BnQoIw/WdEOyeUsiu6UotoZ5YtQ=
dependencies:
mimic-fn "^1.0.0"
[email protected]:
- version "1.0.3"
- resolved "http://registry.npm.taobao.org/opencollective/download/opencollective-1.0.3.tgz#aee6372bc28144583690c3ca8daecfc120dd0ef1"
- dependencies:
- babel-polyfill "6.23.0"
- chalk "1.1.3"
- inquirer "3.0.6"
- minimist "1.2.0"
- node-fetch "1.6.3"
- opn "4.0.2"
-
-opener@^1.4.3:
- version "1.4.3"
- resolved "http://registry.npm.taobao.org/opener/download/opener-1.4.3.tgz#5c6da2c5d7e5831e8ffa3964950f8d6674ac90b8"
-
[email protected]:
- version "4.0.2"
- resolved "http://registry.npm.taobao.org/opn/download/opn-4.0.2.tgz#7abc22e644dff63b0a96d5ab7f2790c0f01abc95"
- dependencies:
- object-assign "^4.0.1"
- pinkie-promise "^2.0.0"
-
[email protected]:
- version "5.2.0"
- resolved "http://registry.npm.taobao.org/opn/download/opn-5.2.0.tgz#71fdf934d6827d676cecbea1531f95d354641225"
- dependencies:
- is-wsl "^1.1.0"
+opencollective-postinstall@^2.0.2:
+ version "2.0.2"
+ resolved "https://registry.yarnpkg.com/opencollective-postinstall/-/opencollective-postinstall-2.0.2.tgz#5657f1bede69b6e33a45939b061eb53d3c6c3a89"
+ integrity sha512-pVOEP16TrAO2/fjej1IdOyupJY8KDUM1CvsaScRbw6oddvpQoOfGk4ywha0HKKVAD6RkW4x6Q+tNBwhf3Bgpuw==
-opn@^5.1.0:
- version "5.3.0"
- resolved "http://registry.npm.taobao.org/opn/download/opn-5.3.0.tgz#64871565c863875f052cfdf53d3e3cb5adb53b1c"
+opn@^5.5.0:
+ version "5.5.0"
+ resolved "https://registry.yarnpkg.com/opn/-/opn-5.5.0.tgz#fc7164fab56d235904c51c3b27da6758ca3b9bfc"
+ integrity sha512-PqHpggC9bLV0VeWcdKhkpxY+3JTzetLSqTCWL/z/tFIbI6G8JCjondXklT1JinczLz2Xib62sSp0T/gKT4KksA==
dependencies:
is-wsl "^1.1.0"
-optimist@^0.6.1, optimist@~0.6.0:
+optimist@^0.6.1:
version "0.6.1"
- resolved "http://registry.npm.taobao.org/optimist/download/optimist-0.6.1.tgz#da3ea74686fa21a19a111c326e90eb15a0196686"
+ resolved "https://registry.yarnpkg.com/optimist/-/optimist-0.6.1.tgz#da3ea74686fa21a19a111c326e90eb15a0196686"
+ integrity sha1-2j6nRob6IaGaERwybpDrFaAZZoY=
dependencies:
minimist "~0.0.1"
wordwrap "~0.0.2"
-optionator@^0.8.1:
+optionator@^0.8.1, optionator@^0.8.2:
version "0.8.2"
- resolved "http://registry.npm.taobao.org/optionator/download/optionator-0.8.2.tgz#364c5e409d3f4d6301d6c0b4c05bba50180aeb64"
+ resolved "https://registry.yarnpkg.com/optionator/-/optionator-0.8.2.tgz#364c5e409d3f4d6301d6c0b4c05bba50180aeb64"
+ integrity sha1-NkxeQJ0/TWMB1sC0wFu6UBgK62Q=
dependencies:
deep-is "~0.1.3"
fast-levenshtein "~2.0.4"
@@ -6713,69 +6927,85 @@ optionator@^0.8.1:
type-check "~0.3.2"
wordwrap "~1.0.0"
-original@>=0.0.5:
- version "1.0.1"
- resolved "http://registry.npm.taobao.org/original/download/original-1.0.1.tgz#b0a53ff42ba997a8c9cd1fb5daaeb42b9d693190"
+original@^1.0.0:
+ version "1.0.2"
+ resolved "https://registry.yarnpkg.com/original/-/original-1.0.2.tgz#e442a61cffe1c5fd20a65f3261c26663b303f25f"
+ integrity sha512-hyBVl6iqqUOJ8FqRe+l/gS8H+kKYjrEndd5Pm1MfBtsEKA038HkkdbAl/72EAXGyonD/PFsvmVG+EvcIpliMBg==
dependencies:
- url-parse "~1.4.0"
+ url-parse "^1.4.3"
os-browserify@^0.3.0:
version "0.3.0"
- resolved "http://registry.npm.taobao.org/os-browserify/download/os-browserify-0.3.0.tgz#854373c7f5c2315914fc9bfc6bd8238fdda1ec27"
+ resolved "https://registry.yarnpkg.com/os-browserify/-/os-browserify-0.3.0.tgz#854373c7f5c2315914fc9bfc6bd8238fdda1ec27"
+ integrity sha1-hUNzx/XCMVkU/Jv8a9gjj92h7Cc=
-os-homedir@^1.0.0, os-homedir@^1.0.1:
+os-homedir@^1.0.0:
version "1.0.2"
- resolved "http://registry.npm.taobao.org/os-homedir/download/os-homedir-1.0.2.tgz#ffbc4988336e0e833de0c168c7ef152121aa7fb3"
-
-os-locale@^1.4.0:
- version "1.4.0"
- resolved "http://registry.npm.taobao.org/os-locale/download/os-locale-1.4.0.tgz#20f9f17ae29ed345e8bde583b13d2009803c14d9"
- dependencies:
- lcid "^1.0.0"
+ resolved "https://registry.yarnpkg.com/os-homedir/-/os-homedir-1.0.2.tgz#ffbc4988336e0e833de0c168c7ef152121aa7fb3"
+ integrity sha1-/7xJiDNuDoM94MFox+8VISGqf7M=
-os-locale@^2.0.0:
- version "2.1.0"
- resolved "http://registry.npm.taobao.org/os-locale/download/os-locale-2.1.0.tgz#42bc2900a6b5b8bd17376c8e882b65afccf24bf2"
+os-locale@^3.0.0, os-locale@^3.1.0:
+ version "3.1.0"
+ resolved "https://registry.yarnpkg.com/os-locale/-/os-locale-3.1.0.tgz#a802a6ee17f24c10483ab9935719cef4ed16bf1a"
+ integrity sha512-Z8l3R4wYWM40/52Z+S265okfFj8Kt2cC2MKY+xNi3kFs+XGI7WXu/I309QQQYbRW4ijiZ+yxs9pqEhJh0DqW3Q==
dependencies:
- execa "^0.7.0"
- lcid "^1.0.0"
- mem "^1.1.0"
-
-os-shim@^0.1.2:
- version "0.1.3"
- resolved "http://registry.npm.taobao.org/os-shim/download/os-shim-0.1.3.tgz#6b62c3791cf7909ea35ed46e17658bb417cb3917"
+ execa "^1.0.0"
+ lcid "^2.0.0"
+ mem "^4.0.0"
-os-tmpdir@^1.0.0, os-tmpdir@^1.0.1, os-tmpdir@~1.0.1, os-tmpdir@~1.0.2:
+os-tmpdir@^1.0.0, os-tmpdir@~1.0.2:
version "1.0.2"
- resolved "http://registry.npm.taobao.org/os-tmpdir/download/os-tmpdir-1.0.2.tgz#bbe67406c79aa85c5cfec766fe5734555dfa1274"
+ resolved "https://registry.yarnpkg.com/os-tmpdir/-/os-tmpdir-1.0.2.tgz#bbe67406c79aa85c5cfec766fe5734555dfa1274"
+ integrity sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ=
-osenv@0, osenv@^0.1.4:
+osenv@^0.1.4:
version "0.1.5"
- resolved "http://registry.npm.taobao.org/osenv/download/osenv-0.1.5.tgz#85cdfafaeb28e8677f416e287592b5f3f49ea410"
+ resolved "https://registry.yarnpkg.com/osenv/-/osenv-0.1.5.tgz#85cdfafaeb28e8677f416e287592b5f3f49ea410"
+ integrity sha512-0CWcCECdMVc2Rw3U5w9ZjqX6ga6ubk1xDVKxtBQPK7wis/0F2r9T6k4ydGYhecl7YUBxBVxhL5oisPsNxAPe2g==
dependencies:
os-homedir "^1.0.0"
os-tmpdir "^1.0.0"
+p-defer@^1.0.0:
+ version "1.0.0"
+ resolved "https://registry.yarnpkg.com/p-defer/-/p-defer-1.0.0.tgz#9f6eb182f6c9aa8cd743004a7d4f96b196b0fb0c"
+ integrity sha1-n26xgvbJqozXQwBKfU+WsZaw+ww=
+
+p-each-series@^1.0.0:
+ version "1.0.0"
+ resolved "https://registry.yarnpkg.com/p-each-series/-/p-each-series-1.0.0.tgz#930f3d12dd1f50e7434457a22cd6f04ac6ad7f71"
+ integrity sha1-kw89Et0fUOdDRFeiLNbwSsatf3E=
+ dependencies:
+ p-reduce "^1.0.0"
+
p-finally@^1.0.0:
version "1.0.0"
- resolved "http://registry.npm.taobao.org/p-finally/download/p-finally-1.0.0.tgz#3fbcfb15b899a44123b34b6dcc18b724336a2cae"
+ resolved "https://registry.yarnpkg.com/p-finally/-/p-finally-1.0.0.tgz#3fbcfb15b899a44123b34b6dcc18b724336a2cae"
+ integrity sha1-P7z7FbiZpEEjs0ttzBi3JDNqLK4=
+
+p-is-promise@^2.0.0:
+ version "2.1.0"
+ resolved "https://registry.yarnpkg.com/p-is-promise/-/p-is-promise-2.1.0.tgz#918cebaea248a62cf7ffab8e3bca8c5f882fc42e"
+ integrity sha512-Y3W0wlRPK8ZMRbNq97l4M5otioeA5lm1z7bkNkxCka8HSPjR0xRWmpCmc9utiaLP9Jb1eD8BgeIxTW4AIF45Pg==
p-limit@^1.0.0, p-limit@^1.1.0:
- version "1.2.0"
- resolved "http://registry.npm.taobao.org/p-limit/download/p-limit-1.2.0.tgz#0e92b6bedcb59f022c13d0f1949dc82d15909f1c"
+ version "1.3.0"
+ resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-1.3.0.tgz#b86bd5f0c25690911c7590fcbfc2010d54b3ccb8"
+ integrity sha512-vvcXsLAJ9Dr5rQOPk7toZQZJApBl2K4J6dANSsEuh6QI41JYcsS/qhTGa9ErIUUgK3WNQoJYvylxvjqmiqEA9Q==
dependencies:
p-try "^1.0.0"
-p-limit@^2.0.0:
- version "2.0.0"
- resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-2.0.0.tgz#e624ed54ee8c460a778b3c9f3670496ff8a57aec"
- integrity sha512-fl5s52lI5ahKCernzzIyAP0QAZbGIovtVHGwpcu1Jr/EpzLVDI2myISHwGqK7m8uQFugVWSrbxH7XnhGtvEc+A==
+p-limit@^2.0.0, p-limit@^2.2.0:
+ version "2.2.0"
+ resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-2.2.0.tgz#417c9941e6027a9abcba5092dd2904e255b5fbc2"
+ integrity sha512-pZbTJpoUsCzV48Mc9Nh51VbwO0X9cuPFE8gYwx9BTCt9SF8/b7Zljd2fVgOxhIF/HDTKgpVzs+GPhyKfjLLFRQ==
dependencies:
p-try "^2.0.0"
p-locate@^2.0.0:
version "2.0.0"
- resolved "http://registry.npm.taobao.org/p-locate/download/p-locate-2.0.0.tgz#20a0103b222a70c8fd39cc2e580680f3dde5ec43"
+ resolved "https://registry.yarnpkg.com/p-locate/-/p-locate-2.0.0.tgz#20a0103b222a70c8fd39cc2e580680f3dde5ec43"
+ integrity sha1-IKAQOyIqcMj9OcwuWAaA893l7EM=
dependencies:
p-limit "^1.1.0"
@@ -6786,37 +7016,49 @@ p-locate@^3.0.0:
dependencies:
p-limit "^2.0.0"
-p-map@^1.1.1:
- version "1.2.0"
- resolved "http://registry.npm.taobao.org/p-map/download/p-map-1.2.0.tgz#e4e94f311eabbc8633a1e79908165fca26241b6b"
+p-locate@^4.1.0:
+ version "4.1.0"
+ resolved "https://registry.yarnpkg.com/p-locate/-/p-locate-4.1.0.tgz#a3428bb7088b3a60292f66919278b7c297ad4f07"
+ integrity sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==
+ dependencies:
+ p-limit "^2.2.0"
-p-try@^1.0.0:
- version "1.0.0"
- resolved "http://registry.npm.taobao.org/p-try/download/p-try-1.0.0.tgz#cbc79cdbaf8fd4228e13f621f2b1a237c1b207b3"
+p-map@^2.0.0:
+ version "2.1.0"
+ resolved "https://registry.yarnpkg.com/p-map/-/p-map-2.1.0.tgz#310928feef9c9ecc65b68b17693018a665cea175"
+ integrity sha512-y3b8Kpd8OAN444hxfBbFfj1FY/RjtTd8tzYwhUqNYXx0fXx2iX4maP4Qr6qhIKbQXI02wTLAda4fYUbDagTUFw==
-p-try@^2.0.0:
- version "2.0.0"
- resolved "https://registry.yarnpkg.com/p-try/-/p-try-2.0.0.tgz#85080bb87c64688fa47996fe8f7dfbe8211760b1"
- integrity sha512-hMp0onDKIajHfIkdRk3P4CdCmErkYAxxDtP3Wx/4nZ3aGlau2VKh3mZpcuFkH27WQkL/3WBCPOktzA9ZOAnMQQ==
+p-reduce@^1.0.0:
+ version "1.0.0"
+ resolved "https://registry.yarnpkg.com/p-reduce/-/p-reduce-1.0.0.tgz#18c2b0dd936a4690a529f8231f58a0fdb6a47dfa"
+ integrity sha1-GMKw3ZNqRpClKfgjH1ig/bakffo=
-pad-right@^0.2.2:
- version "0.2.2"
- resolved "http://registry.npm.taobao.org/pad-right/download/pad-right-0.2.2.tgz#6fbc924045d244f2a2a244503060d3bfc6009774"
+p-retry@^3.0.1:
+ version "3.0.1"
+ resolved "https://registry.yarnpkg.com/p-retry/-/p-retry-3.0.1.tgz#316b4c8893e2c8dc1cfa891f406c4b422bebf328"
+ integrity sha512-XE6G4+YTTkT2a0UWb2kjZe8xNwf8bIbnqpc/IS/idOBVhyves0mK5OJgeocjx7q5pvX/6m23xuzVPYT1uGM73w==
dependencies:
- repeat-string "^1.5.2"
+ retry "^0.12.0"
-pako@^1.0.10:
- version "1.0.10"
- resolved "http://registry.npm.taobao.org/pako/download/pako-1.0.10.tgz#4328badb5086a426aa90f541977d4955da5c9732"
- integrity sha1-Qyi621CGpCaqkPVBl31JVdpclzI=
+p-try@^1.0.0:
+ version "1.0.0"
+ resolved "https://registry.yarnpkg.com/p-try/-/p-try-1.0.0.tgz#cbc79cdbaf8fd4228e13f621f2b1a237c1b207b3"
+ integrity sha1-y8ec26+P1CKOE/Yh8rGiN8GyB7M=
+
+p-try@^2.0.0:
+ version "2.2.0"
+ resolved "https://registry.yarnpkg.com/p-try/-/p-try-2.2.0.tgz#cb2868540e313d61de58fafbe35ce9004d5540e6"
+ integrity sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==
pako@~1.0.5:
- version "1.0.6"
- resolved "http://registry.npm.taobao.org/pako/download/pako-1.0.6.tgz#0101211baa70c4bca4a0f63f2206e97b7dfaf258"
+ version "1.0.10"
+ resolved "https://registry.yarnpkg.com/pako/-/pako-1.0.10.tgz#4328badb5086a426aa90f541977d4955da5c9732"
+ integrity sha512-0DTvPVU3ed8+HNXOu5Bs+o//Mbdj9VNQMUOe9oKCwh8l0GNwpTDMKCWbRjgtD291AWnkAgkqA/LOnQS8AmS1tw==
parallel-transform@^1.1.0:
version "1.1.0"
- resolved "http://registry.npm.taobao.org/parallel-transform/download/parallel-transform-1.1.0.tgz#d410f065b05da23081fcd10f28854c29bda33b06"
+ resolved "https://registry.yarnpkg.com/parallel-transform/-/parallel-transform-1.1.0.tgz#d410f065b05da23081fcd10f28854c29bda33b06"
+ integrity sha1-1BDwZbBdojCB/NEPKIVMKb2jOwY=
dependencies:
cyclist "~0.2.2"
inherits "^2.0.3"
@@ -6824,115 +7066,133 @@ parallel-transform@^1.1.0:
[email protected]:
version "2.1.1"
- resolved "http://registry.npm.taobao.org/param-case/download/param-case-2.1.1.tgz#df94fd8cf6531ecf75e6bef9a0858fbc72be2247"
+ resolved "https://registry.yarnpkg.com/param-case/-/param-case-2.1.1.tgz#df94fd8cf6531ecf75e6bef9a0858fbc72be2247"
+ integrity sha1-35T9jPZTHs915r75oIWPvHK+Ikc=
dependencies:
no-case "^2.2.0"
+parent-module@^1.0.0:
+ version "1.0.1"
+ resolved "https://registry.yarnpkg.com/parent-module/-/parent-module-1.0.1.tgz#691d2709e78c79fae3a156622452d00762caaaa2"
+ integrity sha512-GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g==
+ dependencies:
+ callsites "^3.0.0"
+
parse-asn1@^5.0.0:
- version "5.1.1"
- resolved "http://registry.npm.taobao.org/parse-asn1/download/parse-asn1-5.1.1.tgz#f6bf293818332bd0dab54efb16087724745e6ca8"
+ version "5.1.4"
+ resolved "https://registry.yarnpkg.com/parse-asn1/-/parse-asn1-5.1.4.tgz#37f6628f823fbdeb2273b4d540434a22f3ef1fcc"
+ integrity sha512-Qs5duJcuvNExRfFZ99HDD3z4mAi3r9Wl/FOjEOijlxwCZs7E7mW2vjTpgQ4J8LpTF8x5v+1Vn5UQFejmWT11aw==
dependencies:
asn1.js "^4.0.0"
browserify-aes "^1.0.0"
create-hash "^1.1.0"
evp_bytestokey "^1.0.0"
pbkdf2 "^3.0.3"
+ safe-buffer "^5.1.1"
parse-github-repo-url@^1.3.0:
version "1.4.1"
- resolved "http://registry.npm.taobao.org/parse-github-repo-url/download/parse-github-repo-url-1.4.1.tgz#9e7d8bb252a6cb6ba42595060b7bf6df3dbc1f50"
-
-parse-glob@^3.0.4:
- version "3.0.4"
- resolved "http://registry.npm.taobao.org/parse-glob/download/parse-glob-3.0.4.tgz#b2c376cfb11f35513badd173ef0bb6e3a388391c"
- dependencies:
- glob-base "^0.3.0"
- is-dotfile "^1.0.0"
- is-extglob "^1.0.0"
- is-glob "^2.0.0"
+ resolved "https://registry.yarnpkg.com/parse-github-repo-url/-/parse-github-repo-url-1.4.1.tgz#9e7d8bb252a6cb6ba42595060b7bf6df3dbc1f50"
+ integrity sha1-nn2LslKmy2ukJZUGC3v23z28H1A=
parse-json@^2.2.0:
version "2.2.0"
- resolved "http://registry.npm.taobao.org/parse-json/download/parse-json-2.2.0.tgz#f480f40434ef80741f8469099f8dea18f55a4dc9"
+ resolved "https://registry.yarnpkg.com/parse-json/-/parse-json-2.2.0.tgz#f480f40434ef80741f8469099f8dea18f55a4dc9"
+ integrity sha1-9ID0BDTvgHQfhGkJn43qGPVaTck=
dependencies:
error-ex "^1.2.0"
parse-json@^4.0.0:
version "4.0.0"
- resolved "http://registry.npm.taobao.org/parse-json/download/parse-json-4.0.0.tgz#be35f5425be1f7f6c747184f98a788cb99477ee0"
+ resolved "https://registry.yarnpkg.com/parse-json/-/parse-json-4.0.0.tgz#be35f5425be1f7f6c747184f98a788cb99477ee0"
+ integrity sha1-vjX1Qlvh9/bHRxhPmKeIy5lHfuA=
dependencies:
error-ex "^1.3.1"
json-parse-better-errors "^1.0.1"
parse-passwd@^1.0.0:
version "1.0.0"
- resolved "http://registry.npm.taobao.org/parse-passwd/download/parse-passwd-1.0.0.tgz#6d5b934a456993b23d37f40a382d6f1666a8e5c6"
+ resolved "https://registry.yarnpkg.com/parse-passwd/-/parse-passwd-1.0.0.tgz#6d5b934a456993b23d37f40a382d6f1666a8e5c6"
+ integrity sha1-bVuTSkVpk7I9N/QKOC1vFmao5cY=
[email protected]:
version "4.0.0"
- resolved "http://registry.npm.taobao.org/parse5/download/parse5-4.0.0.tgz#6d78656e3da8d78b4ec0b906f7c08ef1dfe3f608"
-
-parse5@^3.0.1, parse5@^3.0.3:
- version "3.0.3"
- resolved "http://registry.npm.taobao.org/parse5/download/parse5-3.0.3.tgz#042f792ffdd36851551cf4e9e066b3874ab45b5c"
- dependencies:
- "@types/node" "*"
+ resolved "https://registry.yarnpkg.com/parse5/-/parse5-4.0.0.tgz#6d78656e3da8d78b4ec0b906f7c08ef1dfe3f608"
+ integrity sha512-VrZ7eOd3T1Fk4XWNXMgiGBK/z0MG48BWG2uQNU4I72fkQuKUTZpl+u9k+CxEG0twMVzSmXEEz12z5Fnw1jIQFA==
-parseurl@~1.3.2:
- version "1.3.2"
- resolved "http://registry.npm.taobao.org/parseurl/download/parseurl-1.3.2.tgz#fc289d4ed8993119460c156253262cdc8de65bf3"
+parseurl@~1.3.2, parseurl@~1.3.3:
+ version "1.3.3"
+ resolved "https://registry.yarnpkg.com/parseurl/-/parseurl-1.3.3.tgz#9da19e7bee8d12dff0513ed5b76957793bc2e8d4"
+ integrity sha512-CiyeOxFT/JZyN5m0z9PfXw4SCBJ6Sygz1Dpl0wqjlhDEGGBP1GnsUVEL0p63hoG1fcj3fHynXi9NYO4nWOL+qQ==
pascalcase@^0.1.1:
version "0.1.1"
- resolved "http://registry.npm.taobao.org/pascalcase/download/pascalcase-0.1.1.tgz#b363e55e8006ca6fe21784d2db22bd15d7917f14"
+ resolved "https://registry.yarnpkg.com/pascalcase/-/pascalcase-0.1.1.tgz#b363e55e8006ca6fe21784d2db22bd15d7917f14"
+ integrity sha1-s2PlXoAGym/iF4TS2yK9FdeRfxQ=
[email protected]:
- version "0.0.0"
- resolved "http://registry.npm.taobao.org/path-browserify/download/path-browserify-0.0.0.tgz#a0b870729aae214005b7d5032ec2cbbb0fb4451a"
[email protected]:
+ version "0.0.1"
+ resolved "https://registry.yarnpkg.com/path-browserify/-/path-browserify-0.0.1.tgz#e6c4ddd7ed3aa27c68a20cc4e50e1a4ee83bbc4a"
+ integrity sha512-BapA40NHICOS+USX9SN4tyhq+A2RrN/Ws5F0Z5aMHDp98Fl86lX8Oti8B7uN93L4Ifv4fHOEA+pQw87gmMO/lQ==
path-dirname@^1.0.0:
version "1.0.2"
- resolved "http://registry.npm.taobao.org/path-dirname/download/path-dirname-1.0.2.tgz#cc33d24d525e099a5388c0336c6e32b9160609e0"
+ resolved "https://registry.yarnpkg.com/path-dirname/-/path-dirname-1.0.2.tgz#cc33d24d525e099a5388c0336c6e32b9160609e0"
+ integrity sha1-zDPSTVJeCZpTiMAzbG4yuRYGCeA=
[email protected], path-exists@^2.0.0:
+path-exists@^2.0.0:
version "2.1.0"
- resolved "http://registry.npm.taobao.org/path-exists/download/path-exists-2.1.0.tgz#0feb6c64f0fc518d9a754dd5efb62c7022761f4b"
+ resolved "https://registry.yarnpkg.com/path-exists/-/path-exists-2.1.0.tgz#0feb6c64f0fc518d9a754dd5efb62c7022761f4b"
+ integrity sha1-D+tsZPD8UY2adU3V77YscCJ2H0s=
dependencies:
pinkie-promise "^2.0.0"
path-exists@^3.0.0:
version "3.0.0"
- resolved "http://registry.npm.taobao.org/path-exists/download/path-exists-3.0.0.tgz#ce0ebeaa5f78cb18925ea7d810d7b59b010fd515"
+ resolved "https://registry.yarnpkg.com/path-exists/-/path-exists-3.0.0.tgz#ce0ebeaa5f78cb18925ea7d810d7b59b010fd515"
+ integrity sha1-zg6+ql94yxiSXqfYENe1mwEP1RU=
+
+path-exists@^4.0.0:
+ version "4.0.0"
+ resolved "https://registry.yarnpkg.com/path-exists/-/path-exists-4.0.0.tgz#513bdbe2d3b95d7762e8c1137efa195c6c61b5b3"
+ integrity sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==
-path-is-absolute@^1.0.0, path-is-absolute@^1.0.1:
+path-is-absolute@^1.0.0:
version "1.0.1"
- resolved "http://registry.npm.taobao.org/path-is-absolute/download/path-is-absolute-1.0.1.tgz#174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f"
+ resolved "https://registry.yarnpkg.com/path-is-absolute/-/path-is-absolute-1.0.1.tgz#174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f"
+ integrity sha1-F0uSaHNVNP+8es5r9TpanhtcX18=
-path-is-inside@^1.0.1:
+path-is-inside@^1.0.2:
version "1.0.2"
- resolved "http://registry.npm.taobao.org/path-is-inside/download/path-is-inside-1.0.2.tgz#365417dede44430d1c11af61027facf074bdfc53"
+ resolved "https://registry.yarnpkg.com/path-is-inside/-/path-is-inside-1.0.2.tgz#365417dede44430d1c11af61027facf074bdfc53"
+ integrity sha1-NlQX3t5EQw0cEa9hAn+s8HS9/FM=
path-key@^2.0.0, path-key@^2.0.1:
version "2.0.1"
- resolved "http://registry.npm.taobao.org/path-key/download/path-key-2.0.1.tgz#411cadb574c5a140d3a4b1910d40d80cc9f40b40"
+ resolved "https://registry.yarnpkg.com/path-key/-/path-key-2.0.1.tgz#411cadb574c5a140d3a4b1910d40d80cc9f40b40"
+ integrity sha1-QRyttXTFoUDTpLGRDUDYDMn0C0A=
-path-parse@^1.0.5:
- version "1.0.5"
- resolved "http://registry.npm.taobao.org/path-parse/download/path-parse-1.0.5.tgz#3c1adf871ea9cd6c9431b6ea2bd74a0ff055c4c1"
+path-parse@^1.0.6:
+ version "1.0.6"
+ resolved "https://registry.yarnpkg.com/path-parse/-/path-parse-1.0.6.tgz#d62dbb5679405d72c4737ec58600e9ddcf06d24c"
+ integrity sha512-GSmOT2EbHrINBf9SR7CDELwlJ8AENk3Qn7OikK4nFYAu3Ote2+JYNVvkpAEQm3/TLNEJFD/xZJjzyxg3KBWOzw==
[email protected]:
version "0.1.7"
- resolved "http://registry.npm.taobao.org/path-to-regexp/download/path-to-regexp-0.1.7.tgz#df604178005f522f15eb4490e7247a1bfaa67f8c"
+ resolved "https://registry.yarnpkg.com/path-to-regexp/-/path-to-regexp-0.1.7.tgz#df604178005f522f15eb4490e7247a1bfaa67f8c"
+ integrity sha1-32BBeABfUi8V60SQ5yR6G/qmf4w=
path-to-regexp@^1.7.0:
version "1.7.0"
- resolved "http://registry.npm.taobao.org/path-to-regexp/download/path-to-regexp-1.7.0.tgz#59fde0f435badacba103a84e9d3bc64e96b9937d"
+ resolved "https://registry.yarnpkg.com/path-to-regexp/-/path-to-regexp-1.7.0.tgz#59fde0f435badacba103a84e9d3bc64e96b9937d"
+ integrity sha1-Wf3g9DW62suhA6hOnTvGTpa5k30=
dependencies:
isarray "0.0.1"
path-type@^1.0.0:
version "1.1.0"
- resolved "http://registry.npm.taobao.org/path-type/download/path-type-1.1.0.tgz#59c44f7ee491da704da415da5a4070ba4f8fe441"
+ resolved "https://registry.yarnpkg.com/path-type/-/path-type-1.1.0.tgz#59c44f7ee491da704da415da5a4070ba4f8fe441"
+ integrity sha1-WcRPfuSR2nBNpBXaWkBwuk+P5EE=
dependencies:
graceful-fs "^4.1.2"
pify "^2.0.0"
@@ -6940,26 +7200,27 @@ path-type@^1.0.0:
path-type@^2.0.0:
version "2.0.0"
- resolved "http://registry.npm.taobao.org/path-type/download/path-type-2.0.0.tgz#f012ccb8415b7096fc2daa1054c3d72389594c73"
+ resolved "https://registry.yarnpkg.com/path-type/-/path-type-2.0.0.tgz#f012ccb8415b7096fc2daa1054c3d72389594c73"
+ integrity sha1-8BLMuEFbcJb8LaoQVMPXI4lZTHM=
dependencies:
pify "^2.0.0"
path-type@^3.0.0:
version "3.0.0"
- resolved "http://registry.npm.taobao.org/path-type/download/path-type-3.0.0.tgz#cef31dc8e0a1a3bb0d105c0cd97cf3bf47f4e36f"
+ resolved "https://registry.yarnpkg.com/path-type/-/path-type-3.0.0.tgz#cef31dc8e0a1a3bb0d105c0cd97cf3bf47f4e36f"
+ integrity sha512-T2ZUsdZFHgA3u4e5PfPbjd7HDDpxPnQb5jN0SrDsjNSuVXHJqtwTnWqG0B1jZrgmJ/7lj1EmVIByWt1gxGkWvg==
dependencies:
pify "^3.0.0"
-path@^0.12.7:
- version "0.12.7"
- resolved "http://registry.npm.taobao.org/path/download/path-0.12.7.tgz#d4dc2a506c4ce2197eb481ebfcd5b36c0140b10f"
- dependencies:
- process "^0.11.1"
- util "^0.10.3"
+path-type@^4.0.0:
+ version "4.0.0"
+ resolved "https://registry.yarnpkg.com/path-type/-/path-type-4.0.0.tgz#84ed01c0a7ba380afe09d90a8c180dcd9d03043b"
+ integrity sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw==
pbkdf2@^3.0.3:
- version "3.0.16"
- resolved "http://registry.npm.taobao.org/pbkdf2/download/pbkdf2-3.0.16.tgz#7404208ec6b01b62d85bf83853a8064f8d9c2a5c"
+ version "3.0.17"
+ resolved "https://registry.yarnpkg.com/pbkdf2/-/pbkdf2-3.0.17.tgz#976c206530617b14ebb32114239f7b09336e93a6"
+ integrity sha512-U/il5MsrZp7mGg3mSQfn742na2T+1/vHDCG5/iTI3X9MKUuYUZVLQhyRsg06mCgDBTd57TxzgZt7P+fYfjRLtA==
dependencies:
create-hash "^1.1.2"
create-hmac "^1.1.4"
@@ -6969,29 +7230,52 @@ pbkdf2@^3.0.3:
performance-now@^2.1.0:
version "2.1.0"
- resolved "http://registry.npm.taobao.org/performance-now/download/performance-now-2.1.0.tgz#6309f4e0e5fa913ec1c69307ae364b4b377c9e7b"
+ resolved "https://registry.yarnpkg.com/performance-now/-/performance-now-2.1.0.tgz#6309f4e0e5fa913ec1c69307ae364b4b377c9e7b"
+ integrity sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns=
+
+picomatch@^2.0.5:
+ version "2.0.7"
+ resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-2.0.7.tgz#514169d8c7cd0bdbeecc8a2609e34a7163de69f6"
+ integrity sha512-oLHIdio3tZ0qH76NybpeneBhYVj0QFTfXEFTc/B3zKQspYfYYkWYgFsmzo+4kvId/bQRcNkVeguI3y+CD22BtA==
pify@^2.0.0, pify@^2.3.0:
version "2.3.0"
- resolved "http://registry.npm.taobao.org/pify/download/pify-2.3.0.tgz#ed141a6ac043a849ea588498e7dca8b15330e90c"
+ resolved "https://registry.yarnpkg.com/pify/-/pify-2.3.0.tgz#ed141a6ac043a849ea588498e7dca8b15330e90c"
+ integrity sha1-7RQaasBDqEnqWISY59yosVMw6Qw=
pify@^3.0.0:
version "3.0.0"
- resolved "http://registry.npm.taobao.org/pify/download/pify-3.0.0.tgz#e5a4acd2c101fdf3d9a4d07f0dbc4db49dd28176"
+ resolved "https://registry.yarnpkg.com/pify/-/pify-3.0.0.tgz#e5a4acd2c101fdf3d9a4d07f0dbc4db49dd28176"
+ integrity sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY=
+
+pify@^4.0.1:
+ version "4.0.1"
+ resolved "https://registry.yarnpkg.com/pify/-/pify-4.0.1.tgz#4b2cd25c50d598735c50292224fd8c6df41e3231"
+ integrity sha512-uB80kBFb/tfd68bVleG9T5GGsGPjJrLAUpR5PZIrhBnIaRTQRjqdJSsIKkOP6OAIFbj7GOrcudc5pNjZ+geV2g==
pinkie-promise@^2.0.0:
version "2.0.1"
- resolved "http://registry.npm.taobao.org/pinkie-promise/download/pinkie-promise-2.0.1.tgz#2135d6dfa7a358c069ac9b178776288228450ffa"
+ resolved "https://registry.yarnpkg.com/pinkie-promise/-/pinkie-promise-2.0.1.tgz#2135d6dfa7a358c069ac9b178776288228450ffa"
+ integrity sha1-ITXW36ejWMBprJsXh3YogihFD/o=
dependencies:
pinkie "^2.0.0"
pinkie@^2.0.0:
version "2.0.4"
- resolved "http://registry.npm.taobao.org/pinkie/download/pinkie-2.0.4.tgz#72556b80cfa0d48a974e80e77248e80ed4f7f870"
+ resolved "https://registry.yarnpkg.com/pinkie/-/pinkie-2.0.4.tgz#72556b80cfa0d48a974e80e77248e80ed4f7f870"
+ integrity sha1-clVrgM+g1IqXToDnckjoDtT3+HA=
+
+pirates@^4.0.1:
+ version "4.0.1"
+ resolved "https://registry.yarnpkg.com/pirates/-/pirates-4.0.1.tgz#643a92caf894566f91b2b986d2c66950a8e2fb87"
+ integrity sha512-WuNqLTbMI3tmfef2TKxlQmAiLHKtFhlsCZnPIpuv2Ow0RDVO8lfy1Opf4NUzlMXLjPl+Men7AuVdX6TA+s+uGA==
+ dependencies:
+ node-modules-regexp "^1.0.0"
pkg-dir@^2.0.0:
version "2.0.0"
- resolved "http://registry.npm.taobao.org/pkg-dir/download/pkg-dir-2.0.0.tgz#f6d5d1109e19d63edf428e0bd57e12777615334b"
+ resolved "https://registry.yarnpkg.com/pkg-dir/-/pkg-dir-2.0.0.tgz#f6d5d1109e19d63edf428e0bd57e12777615334b"
+ integrity sha1-9tXREJ4Z1j7fQo4L1X4Sd3YVM0s=
dependencies:
find-up "^2.1.0"
@@ -7002,6 +7286,13 @@ pkg-dir@^3.0.0:
dependencies:
find-up "^3.0.0"
+pkg-dir@^4.2.0:
+ version "4.2.0"
+ resolved "https://registry.yarnpkg.com/pkg-dir/-/pkg-dir-4.2.0.tgz#f099133df7ede422e81d1d8448270eeb3e4261f3"
+ integrity sha512-HRDzbaKjC+AOWVXxAU/x54COGeIv9eb+6CkDSQoNTt4XyWoIJvuPsXizxu/Fr23EiekbtZwmh1IcIG/l/a10GQ==
+ dependencies:
+ find-up "^4.0.0"
+
please-upgrade-node@^3.1.1:
version "3.1.1"
resolved "https://registry.yarnpkg.com/please-upgrade-node/-/please-upgrade-node-3.1.1.tgz#ed320051dfcc5024fae696712c8288993595e8ac"
@@ -7011,11 +7302,13 @@ please-upgrade-node@^3.1.1:
pn@^1.1.0:
version "1.1.0"
- resolved "http://registry.npm.taobao.org/pn/download/pn-1.1.0.tgz#e2f4cef0e219f463c179ab37463e4e1ecdccbafb"
+ resolved "https://registry.yarnpkg.com/pn/-/pn-1.1.0.tgz#e2f4cef0e219f463c179ab37463e4e1ecdccbafb"
+ integrity sha512-2qHaIQr2VLRFoxe2nASzsV6ef4yOOH+Fi9FBOVH6cqeSgUnoyySPZkxzLuzd+RYOQTRpROA0ztTMqxROKSb/nA==
-portfinder@^1.0.9:
- version "1.0.13"
- resolved "http://registry.npm.taobao.org/portfinder/download/portfinder-1.0.13.tgz#bb32ecd87c27104ae6ee44b5a3ccbf0ebb1aede9"
+portfinder@^1.0.20:
+ version "1.0.20"
+ resolved "https://registry.yarnpkg.com/portfinder/-/portfinder-1.0.20.tgz#bea68632e54b2e13ab7b0c4775e9b41bf270e44a"
+ integrity sha512-Yxe4mTyDzTd59PZJY4ojZR8F+E5e97iq2ZOHPz3HDgSvYC5siNad2tLooQ5y5QHyQhc3xVqvyk/eNA3wuoa7Sw==
dependencies:
async "^1.5.2"
debug "^2.2.0"
@@ -7023,411 +7316,185 @@ portfinder@^1.0.9:
posix-character-classes@^0.1.0:
version "0.1.1"
- resolved "http://registry.npm.taobao.org/posix-character-classes/download/posix-character-classes-0.1.1.tgz#01eac0fe3b5af71a2a6c02feabb8c1fef7e00eab"
-
-postcss-calc@^5.2.0:
- version "5.3.1"
- resolved "http://registry.npm.taobao.org/postcss-calc/download/postcss-calc-5.3.1.tgz#77bae7ca928ad85716e2fda42f261bf7c1d65b5e"
- dependencies:
- postcss "^5.0.2"
- postcss-message-helpers "^2.0.0"
- reduce-css-calc "^1.2.6"
-
-postcss-colormin@^2.1.8:
- version "2.2.2"
- resolved "http://registry.npm.taobao.org/postcss-colormin/download/postcss-colormin-2.2.2.tgz#6631417d5f0e909a3d7ec26b24c8a8d1e4f96e4b"
- dependencies:
- colormin "^1.0.5"
- postcss "^5.0.13"
- postcss-value-parser "^3.2.3"
-
-postcss-convert-values@^2.3.4:
- version "2.6.1"
- resolved "http://registry.npm.taobao.org/postcss-convert-values/download/postcss-convert-values-2.6.1.tgz#bbd8593c5c1fd2e3d1c322bb925dcae8dae4d62d"
- dependencies:
- postcss "^5.0.11"
- postcss-value-parser "^3.1.2"
+ resolved "https://registry.yarnpkg.com/posix-character-classes/-/posix-character-classes-0.1.1.tgz#01eac0fe3b5af71a2a6c02feabb8c1fef7e00eab"
+ integrity sha1-AerA/jta9xoqbAL+q7jB/vfgDqs=
-postcss-discard-comments@^2.0.4:
- version "2.0.4"
- resolved "http://registry.npm.taobao.org/postcss-discard-comments/download/postcss-discard-comments-2.0.4.tgz#befe89fafd5b3dace5ccce51b76b81514be00e3d"
+postcss-modules-extract-imports@^2.0.0:
+ version "2.0.0"
+ resolved "https://registry.yarnpkg.com/postcss-modules-extract-imports/-/postcss-modules-extract-imports-2.0.0.tgz#818719a1ae1da325f9832446b01136eeb493cd7e"
+ integrity sha512-LaYLDNS4SG8Q5WAWqIJgdHPJrDDr/Lv775rMBFUbgjTz6j34lUznACHcdRWroPvXANP2Vj7yNK57vp9eFqzLWQ==
dependencies:
- postcss "^5.0.14"
+ postcss "^7.0.5"
-postcss-discard-duplicates@^2.0.1:
- version "2.1.0"
- resolved "http://registry.npm.taobao.org/postcss-discard-duplicates/download/postcss-discard-duplicates-2.1.0.tgz#b9abf27b88ac188158a5eb12abcae20263b91932"
+postcss-modules-local-by-default@^2.0.6:
+ version "2.0.6"
+ resolved "https://registry.yarnpkg.com/postcss-modules-local-by-default/-/postcss-modules-local-by-default-2.0.6.tgz#dd9953f6dd476b5fd1ef2d8830c8929760b56e63"
+ integrity sha512-oLUV5YNkeIBa0yQl7EYnxMgy4N6noxmiwZStaEJUSe2xPMcdNc8WmBQuQCx18H5psYbVxz8zoHk0RAAYZXP9gA==
dependencies:
- postcss "^5.0.4"
+ postcss "^7.0.6"
+ postcss-selector-parser "^6.0.0"
+ postcss-value-parser "^3.3.1"
-postcss-discard-empty@^2.0.1:
+postcss-modules-scope@^2.1.0:
version "2.1.0"
- resolved "http://registry.npm.taobao.org/postcss-discard-empty/download/postcss-discard-empty-2.1.0.tgz#d2b4bd9d5ced5ebd8dcade7640c7d7cd7f4f92b5"
- dependencies:
- postcss "^5.0.14"
-
-postcss-discard-overridden@^0.1.1:
- version "0.1.1"
- resolved "http://registry.npm.taobao.org/postcss-discard-overridden/download/postcss-discard-overridden-0.1.1.tgz#8b1eaf554f686fb288cd874c55667b0aa3668d58"
- dependencies:
- postcss "^5.0.16"
-
-postcss-discard-unused@^2.2.1:
- version "2.2.3"
- resolved "http://registry.npm.taobao.org/postcss-discard-unused/download/postcss-discard-unused-2.2.3.tgz#bce30b2cc591ffc634322b5fb3464b6d934f4433"
- dependencies:
- postcss "^5.0.14"
- uniqs "^2.0.0"
-
-postcss-filter-plugins@^2.0.0:
- version "2.0.3"
- resolved "http://registry.npm.taobao.org/postcss-filter-plugins/download/postcss-filter-plugins-2.0.3.tgz#82245fdf82337041645e477114d8e593aa18b8ec"
- dependencies:
- postcss "^5.0.4"
-
[email protected]:
- version "3.3.0"
- resolved "http://registry.npm.taobao.org/postcss-flexbugs-fixes/download/postcss-flexbugs-fixes-3.3.0.tgz#e00849b536063749da50a0d410ba5d9ee65e27b8"
- dependencies:
- postcss "^6.0.1"
-
-postcss-increase-specificity@^0.6.0:
- version "0.6.0"
- resolved "http://registry.npm.taobao.org/postcss-increase-specificity/download/postcss-increase-specificity-0.6.0.tgz#28facf95b24527aaaf8e687915da837ab9bd814c"
- dependencies:
- escape-string-regexp "^1.0.5"
- object-assign "^3.0.0"
- postcss "^5.1.2"
- string.prototype.repeat "^0.2.0"
-
-postcss-load-config@^1.1.0, postcss-load-config@^1.2.0:
- version "1.2.0"
- resolved "http://registry.npm.taobao.org/postcss-load-config/download/postcss-load-config-1.2.0.tgz#539e9afc9ddc8620121ebf9d8c3673e0ce50d28a"
- dependencies:
- cosmiconfig "^2.1.0"
- object-assign "^4.1.0"
- postcss-load-options "^1.2.0"
- postcss-load-plugins "^2.3.0"
-
-postcss-load-options@^1.2.0:
- version "1.2.0"
- resolved "http://registry.npm.taobao.org/postcss-load-options/download/postcss-load-options-1.2.0.tgz#b098b1559ddac2df04bc0bb375f99a5cfe2b6d8c"
- dependencies:
- cosmiconfig "^2.1.0"
- object-assign "^4.1.0"
-
-postcss-load-plugins@^2.3.0:
- version "2.3.0"
- resolved "http://registry.npm.taobao.org/postcss-load-plugins/download/postcss-load-plugins-2.3.0.tgz#745768116599aca2f009fad426b00175049d8d92"
- dependencies:
- cosmiconfig "^2.1.1"
- object-assign "^4.1.0"
-
[email protected]:
- version "2.1.1"
- resolved "http://registry.npm.taobao.org/postcss-loader/download/postcss-loader-2.1.1.tgz#208935af3b1d65e1abb1a870a912dd12e7b36895"
- dependencies:
- loader-utils "^1.1.0"
- postcss "^6.0.0"
- postcss-load-config "^1.2.0"
- schema-utils "^0.4.0"
-
-postcss-merge-idents@^2.1.5:
- version "2.1.7"
- resolved "http://registry.npm.taobao.org/postcss-merge-idents/download/postcss-merge-idents-2.1.7.tgz#4c5530313c08e1d5b3bbf3d2bbc747e278eea270"
- dependencies:
- has "^1.0.1"
- postcss "^5.0.10"
- postcss-value-parser "^3.1.1"
-
-postcss-merge-longhand@^2.0.1:
- version "2.0.2"
- resolved "http://registry.npm.taobao.org/postcss-merge-longhand/download/postcss-merge-longhand-2.0.2.tgz#23d90cd127b0a77994915332739034a1a4f3d658"
- dependencies:
- postcss "^5.0.4"
-
-postcss-merge-rules@^2.0.3:
- version "2.1.2"
- resolved "http://registry.npm.taobao.org/postcss-merge-rules/download/postcss-merge-rules-2.1.2.tgz#d1df5dfaa7b1acc3be553f0e9e10e87c61b5f721"
+ resolved "https://registry.yarnpkg.com/postcss-modules-scope/-/postcss-modules-scope-2.1.0.tgz#ad3f5bf7856114f6fcab901b0502e2a2bc39d4eb"
+ integrity sha512-91Rjps0JnmtUB0cujlc8KIKCsJXWjzuxGeT/+Q2i2HXKZ7nBUeF9YQTZZTNvHVoNYj1AthsjnGLtqDUE0Op79A==
dependencies:
- browserslist "^1.5.2"
- caniuse-api "^1.5.2"
- postcss "^5.0.4"
- postcss-selector-parser "^2.2.2"
- vendors "^1.0.0"
+ postcss "^7.0.6"
+ postcss-selector-parser "^6.0.0"
-postcss-message-helpers@^2.0.0:
+postcss-modules-values@^2.0.0:
version "2.0.0"
- resolved "http://registry.npm.taobao.org/postcss-message-helpers/download/postcss-message-helpers-2.0.0.tgz#a4f2f4fab6e4fe002f0aed000478cdf52f9ba60e"
-
-postcss-minify-font-values@^1.0.2:
- version "1.0.5"
- resolved "http://registry.npm.taobao.org/postcss-minify-font-values/download/postcss-minify-font-values-1.0.5.tgz#4b58edb56641eba7c8474ab3526cafd7bbdecb69"
- dependencies:
- object-assign "^4.0.1"
- postcss "^5.0.4"
- postcss-value-parser "^3.0.2"
-
-postcss-minify-gradients@^1.0.1:
- version "1.0.5"
- resolved "http://registry.npm.taobao.org/postcss-minify-gradients/download/postcss-minify-gradients-1.0.5.tgz#5dbda11373703f83cfb4a3ea3881d8d75ff5e6e1"
- dependencies:
- postcss "^5.0.12"
- postcss-value-parser "^3.3.0"
-
-postcss-minify-params@^1.0.4:
- version "1.2.2"
- resolved "http://registry.npm.taobao.org/postcss-minify-params/download/postcss-minify-params-1.2.2.tgz#ad2ce071373b943b3d930a3fa59a358c28d6f1f3"
- dependencies:
- alphanum-sort "^1.0.1"
- postcss "^5.0.2"
- postcss-value-parser "^3.0.2"
- uniqs "^2.0.0"
-
-postcss-minify-selectors@^2.0.4:
- version "2.1.1"
- resolved "http://registry.npm.taobao.org/postcss-minify-selectors/download/postcss-minify-selectors-2.1.1.tgz#b2c6a98c0072cf91b932d1a496508114311735bf"
- dependencies:
- alphanum-sort "^1.0.2"
- has "^1.0.1"
- postcss "^5.0.14"
- postcss-selector-parser "^2.0.0"
-
-postcss-modules-extract-imports@^1.2.0:
- version "1.2.0"
- resolved "http://registry.npm.taobao.org/postcss-modules-extract-imports/download/postcss-modules-extract-imports-1.2.0.tgz#66140ecece38ef06bf0d3e355d69bf59d141ea85"
- dependencies:
- postcss "^6.0.1"
-
-postcss-modules-local-by-default@^1.2.0:
- version "1.2.0"
- resolved "http://registry.npm.taobao.org/postcss-modules-local-by-default/download/postcss-modules-local-by-default-1.2.0.tgz#f7d80c398c5a393fa7964466bd19500a7d61c069"
- dependencies:
- css-selector-tokenizer "^0.7.0"
- postcss "^6.0.1"
-
-postcss-modules-scope@^1.1.0:
- version "1.1.0"
- resolved "http://registry.npm.taobao.org/postcss-modules-scope/download/postcss-modules-scope-1.1.0.tgz#d6ea64994c79f97b62a72b426fbe6056a194bb90"
- dependencies:
- css-selector-tokenizer "^0.7.0"
- postcss "^6.0.1"
-
-postcss-modules-values@^1.3.0:
- version "1.3.0"
- resolved "http://registry.npm.taobao.org/postcss-modules-values/download/postcss-modules-values-1.3.0.tgz#ecffa9d7e192518389f42ad0e83f72aec456ea20"
- dependencies:
- icss-replace-symbols "^1.1.0"
- postcss "^6.0.1"
-
-postcss-normalize-charset@^1.1.0:
- version "1.1.1"
- resolved "http://registry.npm.taobao.org/postcss-normalize-charset/download/postcss-normalize-charset-1.1.1.tgz#ef9ee71212d7fe759c78ed162f61ed62b5cb93f1"
- dependencies:
- postcss "^5.0.5"
-
-postcss-normalize-url@^3.0.7:
- version "3.0.8"
- resolved "http://registry.npm.taobao.org/postcss-normalize-url/download/postcss-normalize-url-3.0.8.tgz#108f74b3f2fcdaf891a2ffa3ea4592279fc78222"
- dependencies:
- is-absolute-url "^2.0.0"
- normalize-url "^1.4.0"
- postcss "^5.0.14"
- postcss-value-parser "^3.2.3"
-
-postcss-ordered-values@^2.1.0:
- version "2.2.3"
- resolved "http://registry.npm.taobao.org/postcss-ordered-values/download/postcss-ordered-values-2.2.3.tgz#eec6c2a67b6c412a8db2042e77fe8da43f95c11d"
- dependencies:
- postcss "^5.0.4"
- postcss-value-parser "^3.0.1"
-
-postcss-reduce-idents@^2.2.2:
- version "2.4.0"
- resolved "http://registry.npm.taobao.org/postcss-reduce-idents/download/postcss-reduce-idents-2.4.0.tgz#c2c6d20cc958284f6abfbe63f7609bf409059ad3"
- dependencies:
- postcss "^5.0.4"
- postcss-value-parser "^3.0.2"
-
-postcss-reduce-initial@^1.0.0:
- version "1.0.1"
- resolved "http://registry.npm.taobao.org/postcss-reduce-initial/download/postcss-reduce-initial-1.0.1.tgz#68f80695f045d08263a879ad240df8dd64f644ea"
- dependencies:
- postcss "^5.0.4"
-
-postcss-reduce-transforms@^1.0.3:
- version "1.0.4"
- resolved "http://registry.npm.taobao.org/postcss-reduce-transforms/download/postcss-reduce-transforms-1.0.4.tgz#ff76f4d8212437b31c298a42d2e1444025771ae1"
- dependencies:
- has "^1.0.1"
- postcss "^5.0.8"
- postcss-value-parser "^3.0.1"
-
-postcss-safe-important@^1.1.0:
- version "1.1.0"
- resolved "http://registry.npm.taobao.org/postcss-safe-important/download/postcss-safe-important-1.1.0.tgz#6ac6841b0a42ba3634167c589b107a54dc03203f"
- dependencies:
- postcss "^5.0.10"
-
-postcss-selector-parser@^2.0.0, postcss-selector-parser@^2.2.2:
- version "2.2.3"
- resolved "http://registry.npm.taobao.org/postcss-selector-parser/download/postcss-selector-parser-2.2.3.tgz#f9437788606c3c9acee16ffe8d8b16297f27bb90"
- dependencies:
- flatten "^1.0.2"
- indexes-of "^1.0.1"
- uniq "^1.0.1"
-
-postcss-svgo@^2.1.1:
- version "2.1.6"
- resolved "http://registry.npm.taobao.org/postcss-svgo/download/postcss-svgo-2.1.6.tgz#b6df18aa613b666e133f08adb5219c2684ac108d"
- dependencies:
- is-svg "^2.0.0"
- postcss "^5.0.14"
- postcss-value-parser "^3.2.3"
- svgo "^0.7.0"
-
-postcss-unique-selectors@^2.0.2:
- version "2.0.2"
- resolved "http://registry.npm.taobao.org/postcss-unique-selectors/download/postcss-unique-selectors-2.0.2.tgz#981d57d29ddcb33e7b1dfe1fd43b8649f933ca1d"
- dependencies:
- alphanum-sort "^1.0.1"
- postcss "^5.0.4"
- uniqs "^2.0.0"
-
-postcss-value-parser@^3.0.1, postcss-value-parser@^3.0.2, postcss-value-parser@^3.1.1, postcss-value-parser@^3.1.2, postcss-value-parser@^3.2.3, postcss-value-parser@^3.3.0:
- version "3.3.0"
- resolved "http://registry.npm.taobao.org/postcss-value-parser/download/postcss-value-parser-3.3.0.tgz#87f38f9f18f774a4ab4c8a232f5c5ce8872a9d15"
-
-postcss-zindex@^2.0.1:
- version "2.2.0"
- resolved "http://registry.npm.taobao.org/postcss-zindex/download/postcss-zindex-2.2.0.tgz#d2109ddc055b91af67fc4cb3b025946639d2af22"
+ resolved "https://registry.yarnpkg.com/postcss-modules-values/-/postcss-modules-values-2.0.0.tgz#479b46dc0c5ca3dc7fa5270851836b9ec7152f64"
+ integrity sha512-Ki7JZa7ff1N3EIMlPnGTZfUMe69FFwiQPnVSXC9mnn3jozCRBYIxiZd44yJOV2AmabOo4qFf8s0dC/+lweG7+w==
dependencies:
- has "^1.0.1"
- postcss "^5.0.4"
- uniqs "^2.0.0"
+ icss-replace-symbols "^1.1.0"
+ postcss "^7.0.6"
-postcss@^5.0.10, postcss@^5.0.11, postcss@^5.0.12, postcss@^5.0.13, postcss@^5.0.14, postcss@^5.0.16, postcss@^5.0.2, postcss@^5.0.4, postcss@^5.0.5, postcss@^5.0.6, postcss@^5.0.8, postcss@^5.1.2, postcss@^5.2.16:
- version "5.2.18"
- resolved "http://registry.npm.taobao.org/postcss/download/postcss-5.2.18.tgz#badfa1497d46244f6390f58b319830d9107853c5"
+postcss-selector-parser@^6.0.0:
+ version "6.0.2"
+ resolved "https://registry.yarnpkg.com/postcss-selector-parser/-/postcss-selector-parser-6.0.2.tgz#934cf799d016c83411859e09dcecade01286ec5c"
+ integrity sha512-36P2QR59jDTOAiIkqEprfJDsoNrvwFei3eCqKd1Y0tUsBimsq39BLp7RD+JWny3WgB1zGhJX8XVePwm9k4wdBg==
dependencies:
- chalk "^1.1.3"
- js-base64 "^2.1.9"
- source-map "^0.5.6"
- supports-color "^3.2.3"
+ cssesc "^3.0.0"
+ indexes-of "^1.0.1"
+ uniq "^1.0.1"
+
+postcss-value-parser@^3.3.0, postcss-value-parser@^3.3.1:
+ version "3.3.1"
+ resolved "https://registry.yarnpkg.com/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz#9ff822547e2893213cf1c30efa51ac5fd1ba8281"
+ integrity sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ==
-postcss@^6.0.0, postcss@^6.0.1, postcss@^6.0.19, postcss@^6.0.8:
- version "6.0.22"
- resolved "http://registry.npm.taobao.org/postcss/download/postcss-6.0.22.tgz#e23b78314905c3b90cbd61702121e7a78848f2a3"
+postcss@^7.0.14, postcss@^7.0.5, postcss@^7.0.6:
+ version "7.0.17"
+ resolved "https://registry.yarnpkg.com/postcss/-/postcss-7.0.17.tgz#4da1bdff5322d4a0acaab4d87f3e782436bad31f"
+ integrity sha512-546ZowA+KZ3OasvQZHsbuEpysvwTZNGJv9EfyCQdsIDltPSWHAeTQ5fQy/Npi2ZDtLI3zs7Ps/p6wThErhm9fQ==
dependencies:
- chalk "^2.4.1"
+ chalk "^2.4.2"
source-map "^0.6.1"
- supports-color "^5.4.0"
+ supports-color "^6.1.0"
prelude-ls@~1.1.2:
version "1.1.2"
- resolved "http://registry.npm.taobao.org/prelude-ls/download/prelude-ls-1.1.2.tgz#21932a549f5e52ffd9a827f570e04be62a97da54"
+ resolved "https://registry.yarnpkg.com/prelude-ls/-/prelude-ls-1.1.2.tgz#21932a549f5e52ffd9a827f570e04be62a97da54"
+ integrity sha1-IZMqVJ9eUv/ZqCf1cOBL5iqX2lQ=
-prepend-http@^1.0.0:
- version "1.0.4"
- resolved "http://registry.npm.taobao.org/prepend-http/download/prepend-http-1.0.4.tgz#d4f4562b0ce3696e41ac52d0e002e57a635dc6dc"
-
-preserve@^0.2.0:
- version "0.2.0"
- resolved "http://registry.npm.taobao.org/preserve/download/preserve-0.2.0.tgz#815ed1f6ebc65926f865b310c0713bcb3315ce4b"
+prepend-http@^2.0.0:
+ version "2.0.0"
+ resolved "https://registry.yarnpkg.com/prepend-http/-/prepend-http-2.0.0.tgz#e92434bfa5ea8c19f41cdfd401d741a3c819d897"
+ integrity sha1-6SQ0v6XqjBn0HN/UAddBo8gZ2Jc=
-prettier@^1.14.3:
- version "1.15.3"
- resolved "http://registry.npm.taobao.org/prettier/download/prettier-1.15.3.tgz#1feaac5bdd181237b54dbe65d874e02a1472786a"
- integrity sha1-H+qsW90YEje1Tb5l2HTgKhRyeGo=
+prettier-linter-helpers@^1.0.0:
+ version "1.0.0"
+ resolved "https://registry.yarnpkg.com/prettier-linter-helpers/-/prettier-linter-helpers-1.0.0.tgz#d23d41fe1375646de2d0104d3454a3008802cf7b"
+ integrity sha512-GbK2cP9nraSSUF9N2XwUwqfzlAFlMNYYl+ShE/V+H8a9uNl/oUqB1w2EL54Jh0OlyRSd8RfWYJ3coVS4TROP2w==
+ dependencies:
+ fast-diff "^1.1.2"
-prettier@^1.7.0:
- version "1.12.1"
- resolved "http://registry.npm.taobao.org/prettier/download/prettier-1.12.1.tgz#c1ad20e803e7749faf905a409d2367e06bbe7325"
+prettier@^1.18.2:
+ version "1.18.2"
+ resolved "https://registry.yarnpkg.com/prettier/-/prettier-1.18.2.tgz#6823e7c5900017b4bd3acf46fe9ac4b4d7bda9ea"
+ integrity sha512-OeHeMc0JhFE9idD4ZdtNibzY0+TPHSpSSb9h8FqtP+YnoZZ1sl8Vc9b1sasjfymH3SonAF4QcA2+mzHPhMvIiw==
-pretty-error@^2.0.2:
+pretty-error@^2.1.1:
version "2.1.1"
- resolved "http://registry.npm.taobao.org/pretty-error/download/pretty-error-2.1.1.tgz#5f4f87c8f91e5ae3f3ba87ab4cf5e03b1a17f1a3"
+ resolved "https://registry.yarnpkg.com/pretty-error/-/pretty-error-2.1.1.tgz#5f4f87c8f91e5ae3f3ba87ab4cf5e03b1a17f1a3"
+ integrity sha1-X0+HyPkeWuPzuoerTPXgOxoX8aM=
dependencies:
renderkid "^2.0.1"
utila "~0.4"
-pretty-format@^22.4.0, pretty-format@^22.4.3:
- version "22.4.3"
- resolved "http://registry.npm.taobao.org/pretty-format/download/pretty-format-22.4.3.tgz#f873d780839a9c02e9664c8a082e9ee79eaac16f"
+pretty-format@^24.8.0:
+ version "24.8.0"
+ resolved "https://registry.yarnpkg.com/pretty-format/-/pretty-format-24.8.0.tgz#8dae7044f58db7cb8be245383b565a963e3c27f2"
+ integrity sha512-P952T7dkrDEplsR+TuY7q3VXDae5Sr7zmQb12JU/NDQa/3CH7/QW0yvqLcGN6jL+zQFKaoJcPc+yJxMTGmosqw==
dependencies:
- ansi-regex "^3.0.0"
+ "@jest/types" "^24.8.0"
+ ansi-regex "^4.0.0"
ansi-styles "^3.2.0"
+ react-is "^16.8.4"
-private@^0.1.6, private@^0.1.7, private@^0.1.8:
+private@^0.1.6, private@~0.1.5:
version "0.1.8"
- resolved "http://registry.npm.taobao.org/private/download/private-0.1.8.tgz#2381edb3689f7a53d653190060fcf822d2f368ff"
+ resolved "https://registry.yarnpkg.com/private/-/private-0.1.8.tgz#2381edb3689f7a53d653190060fcf822d2f368ff"
+ integrity sha512-VvivMrbvd2nKkiG38qjULzlc+4Vx4wm/whI9pQD35YrARNnhxeiRktSOhSukRLFNlzg6Br/cJPet5J/u19r/mg==
process-nextick-args@~2.0.0:
- version "2.0.0"
- resolved "http://registry.npm.taobao.org/process-nextick-args/download/process-nextick-args-2.0.0.tgz#a37d732f4271b4ab1ad070d35508e8290788ffaa"
+ version "2.0.1"
+ resolved "https://registry.yarnpkg.com/process-nextick-args/-/process-nextick-args-2.0.1.tgz#7820d9b16120cc55ca9ae7792680ae7dba6d7fe2"
+ integrity sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag==
-process@^0.11.1, process@^0.11.10:
+process@^0.11.10:
version "0.11.10"
- resolved "http://registry.npm.taobao.org/process/download/process-0.11.10.tgz#7332300e840161bda3e69a1d1d91a7d4bc16f182"
+ resolved "https://registry.yarnpkg.com/process/-/process-0.11.10.tgz#7332300e840161bda3e69a1d1d91a7d4bc16f182"
+ integrity sha1-czIwDoQBYb2j5podHZGn1LwW8YI=
+
+progress@^2.0.0:
+ version "2.0.3"
+ resolved "https://registry.yarnpkg.com/progress/-/progress-2.0.3.tgz#7e8cf8d8f5b8f239c1bc68beb4eb78567d572ef8"
+ integrity sha512-7PiHtLll5LdnKIMw100I+8xJXR5gW2QwWYkT6iJva0bXitZKa/XMrSbdmg3r2Xnaidz9Qumd0VPaMrZlF9V9sA==
promise-inflight@^1.0.1:
version "1.0.1"
- resolved "http://registry.npm.taobao.org/promise-inflight/download/promise-inflight-1.0.1.tgz#98472870bf228132fcbdd868129bad12c3c029e3"
-
-promise-polyfill@^7.1.1:
- version "7.1.2"
- resolved "http://registry.npm.taobao.org/promise-polyfill/download/promise-polyfill-7.1.2.tgz#ab05301d8c28536301622d69227632269a70ca3b"
-
-promise@^7.1.1:
- version "7.3.1"
- resolved "http://registry.npm.taobao.org/promise/download/promise-7.3.1.tgz#064b72602b18f90f29192b8b1bc418ffd1ebd3bf"
- dependencies:
- asap "~2.0.3"
+ resolved "https://registry.yarnpkg.com/promise-inflight/-/promise-inflight-1.0.1.tgz#98472870bf228132fcbdd868129bad12c3c029e3"
+ integrity sha1-mEcocL8igTL8vdhoEputEsPAKeM=
[email protected], prop-types@^15.5.10, prop-types@^15.5.4, prop-types@^15.5.6, prop-types@^15.5.7, prop-types@^15.5.8, prop-types@^15.5.9, prop-types@^15.6.0, prop-types@^15.6.1:
- version "15.6.1"
- resolved "http://registry.npm.taobao.org/prop-types/download/prop-types-15.6.1.tgz#36644453564255ddda391191fb3a125cbdf654ca"
+prompts@^2.0.1:
+ version "2.1.0"
+ resolved "https://registry.yarnpkg.com/prompts/-/prompts-2.1.0.tgz#bf90bc71f6065d255ea2bdc0fe6520485c1b45db"
+ integrity sha512-+x5TozgqYdOwWsQFZizE/Tra3fKvAoy037kOyU6cgz84n8f6zxngLOV4O32kTwt9FcLCxAqw0P/c8rOr9y+Gfg==
dependencies:
- fbjs "^0.8.16"
- loose-envify "^1.3.1"
- object-assign "^4.1.1"
+ kleur "^3.0.2"
+ sisteransi "^1.0.0"
-prop-types@^15.5.0:
- version "15.6.2"
- resolved "http://registry.npm.taobao.org/prop-types/download/prop-types-15.6.2.tgz#05d5ca77b4453e985d60fc7ff8c859094a497102"
- integrity sha1-BdXKd7RFPphdYPx/+MhZCUpJcQI=
+prop-types@^15.6.1, prop-types@^15.6.2, prop-types@^15.7.2:
+ version "15.7.2"
+ resolved "https://registry.yarnpkg.com/prop-types/-/prop-types-15.7.2.tgz#52c41e75b8c87e72b9d9360e0206b99dcbffa6c5"
+ integrity sha512-8QQikdH7//R2vurIJSutZ1smHYTcLpRWEOlHnzcWHmBYrOGUysKwSsrC89BCiFj3CbrfJ/nXFdJepOVrY1GCHQ==
dependencies:
- loose-envify "^1.3.1"
+ loose-envify "^1.4.0"
object-assign "^4.1.1"
+ react-is "^16.8.1"
-proxy-addr@~2.0.3:
- version "2.0.3"
- resolved "http://registry.npm.taobao.org/proxy-addr/download/proxy-addr-2.0.3.tgz#355f262505a621646b3130a728eb647e22055341"
+proxy-addr@~2.0.5:
+ version "2.0.5"
+ resolved "https://registry.yarnpkg.com/proxy-addr/-/proxy-addr-2.0.5.tgz#34cbd64a2d81f4b1fd21e76f9f06c8a45299ee34"
+ integrity sha512-t/7RxHXPH6cJtP0pRG6smSr9QJidhB+3kXu0KgXnbGYMgzEnUxRQ4/LDdfOwZEMyIh3/xHb8PX3t+lfL9z+YVQ==
dependencies:
forwarded "~0.1.2"
- ipaddr.js "1.6.0"
+ ipaddr.js "1.9.0"
prr@~1.0.1:
version "1.0.1"
- resolved "http://registry.npm.taobao.org/prr/download/prr-1.0.1.tgz#d3fc114ba06995a45ec6893f484ceb1d78f5f476"
+ resolved "https://registry.yarnpkg.com/prr/-/prr-1.0.1.tgz#d3fc114ba06995a45ec6893f484ceb1d78f5f476"
+ integrity sha1-0/wRS6BplaRexok/SEzrHXj19HY=
pseudomap@^1.0.2:
version "1.0.2"
- resolved "http://registry.npm.taobao.org/pseudomap/download/pseudomap-1.0.2.tgz#f052a28da70e618917ef0a8ac34c1ae5a68286b3"
+ resolved "https://registry.yarnpkg.com/pseudomap/-/pseudomap-1.0.2.tgz#f052a28da70e618917ef0a8ac34c1ae5a68286b3"
+ integrity sha1-8FKijacOYYkX7wqKw0wa5aaChrM=
+
+psl@^1.1.24, psl@^1.1.28:
+ version "1.2.0"
+ resolved "https://registry.yarnpkg.com/psl/-/psl-1.2.0.tgz#df12b5b1b3a30f51c329eacbdef98f3a6e136dc6"
+ integrity sha512-GEn74ZffufCmkDDLNcl3uuyF/aSD6exEyh1v/ZSdAomB82t6G9hzJVRx0jBmLDW+VfZqks3aScmMw9DszwUalA==
public-encrypt@^4.0.0:
- version "4.0.2"
- resolved "http://registry.npm.taobao.org/public-encrypt/download/public-encrypt-4.0.2.tgz#46eb9107206bf73489f8b85b69d91334c6610994"
+ version "4.0.3"
+ resolved "https://registry.yarnpkg.com/public-encrypt/-/public-encrypt-4.0.3.tgz#4fcc9d77a07e48ba7527e7cbe0de33d0701331e0"
+ integrity sha512-zVpa8oKZSz5bTMTFClc1fQOnyyEzpl5ozpi1B5YcvBrdohMjH2rfsBtyXcuNuwjsDIXmBYlF2N5FlJYhR29t8Q==
dependencies:
bn.js "^4.1.0"
browserify-rsa "^4.0.0"
create-hash "^1.1.0"
parse-asn1 "^5.0.0"
randombytes "^2.0.1"
+ safe-buffer "^5.1.2"
pump@^2.0.0, pump@^2.0.1:
version "2.0.1"
- resolved "http://registry.npm.taobao.org/pump/download/pump-2.0.1.tgz#12399add6e4cf7526d973cbc8b5ce2e2908b3909"
+ resolved "https://registry.yarnpkg.com/pump/-/pump-2.0.1.tgz#12399add6e4cf7526d973cbc8b5ce2e2908b3909"
+ integrity sha512-ruPMNRkN3MHP1cWJc9OWr+T/xDP0jhXYCLfJcBuX54hhfIBnaQmAUMfDcG4DM5UMWByBbJY69QSphm3jtDKIkA==
dependencies:
end-of-stream "^1.1.0"
once "^1.3.1"
@@ -7442,7 +7509,8 @@ pump@^3.0.0:
pumpify@^1.3.3:
version "1.5.1"
- resolved "http://registry.npm.taobao.org/pumpify/download/pumpify-1.5.1.tgz#36513be246ab27570b1a374a5ce278bfd74370ce"
+ resolved "https://registry.yarnpkg.com/pumpify/-/pumpify-1.5.1.tgz#36513be246ab27570b1a374a5ce278bfd74370ce"
+ integrity sha512-oClZI37HvuUJJxSKKrC17bZ9Cu0ZYhEAGPsPUy9KlMUmv9dKX2o77RUmq7f3XjIxbwyGwYzbzQ1L2Ks8sIradQ==
dependencies:
duplexify "^3.6.0"
inherits "^2.0.3"
@@ -7450,754 +7518,184 @@ pumpify@^1.3.3:
[email protected]:
version "1.3.2"
- resolved "http://registry.npm.taobao.org/punycode/download/punycode-1.3.2.tgz#9653a036fb7c1ee42342f2325cceefea3926c48d"
+ resolved "https://registry.yarnpkg.com/punycode/-/punycode-1.3.2.tgz#9653a036fb7c1ee42342f2325cceefea3926c48d"
+ integrity sha1-llOgNvt8HuQjQvIyXM7v6jkmxI0=
punycode@^1.2.4, punycode@^1.4.1:
version "1.4.1"
- resolved "http://registry.npm.taobao.org/punycode/download/punycode-1.4.1.tgz#c0d5a63b2718800ad8e1eb0fa5269c84dd41845e"
+ resolved "https://registry.yarnpkg.com/punycode/-/punycode-1.4.1.tgz#c0d5a63b2718800ad8e1eb0fa5269c84dd41845e"
+ integrity sha1-wNWmOycYgArY4esPpSachN1BhF4=
-punycode@^2.1.0:
+punycode@^2.1.0, punycode@^2.1.1:
version "2.1.1"
- resolved "http://registry.npm.taobao.org/punycode/download/punycode-2.1.1.tgz#b58b010ac40c22c5657616c8d2c2c02c7bf479ec"
+ resolved "https://registry.yarnpkg.com/punycode/-/punycode-2.1.1.tgz#b58b010ac40c22c5657616c8d2c2c02c7bf479ec"
+ integrity sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==
-q@^1.1.2, q@^1.4.1, q@^1.5.1:
+q@^1.5.1:
version "1.5.1"
- resolved "http://registry.npm.taobao.org/q/download/q-1.5.1.tgz#7e32f75b41381291d04611f1bf14109ac00651d7"
-
[email protected]:
- version "0.0.0"
- resolved "https://registry.yarnpkg.com/qr.js/-/qr.js-0.0.0.tgz#cace86386f59a0db8050fa90d9b6b0e88a1e364f"
- integrity sha1-ys6GOG9ZoNuAUPqQ2baw6IoeNk8=
-
-qrcode.react@^0.9.2:
- version "0.9.2"
- resolved "https://registry.yarnpkg.com/qrcode.react/-/qrcode.react-0.9.2.tgz#52f9d55db38bc2d75d63b685ca266b7d6286575b"
- integrity sha512-opV0IA4w84qMaZg3hhgmktDs1xjfx3K7RAOzdvmKgkLdhmtv95AYGZmlG0s3NIAZ1qXCK4AyPJayLd3sa6p/RA==
- dependencies:
- prop-types "^15.6.0"
- qr.js "0.0.0"
-
[email protected]:
- version "6.5.1"
- resolved "http://registry.npm.taobao.org/qs/download/qs-6.5.1.tgz#349cdf6eef89ec45c12d7d5eb3fc0c870343a6d8"
+ resolved "https://registry.yarnpkg.com/q/-/q-1.5.1.tgz#7e32f75b41381291d04611f1bf14109ac00651d7"
+ integrity sha1-fjL3W0E4EpHQRhHxvxQQmsAGUdc=
-qs@~6.3.0:
- version "6.3.2"
- resolved "http://registry.npm.taobao.org/qs/download/qs-6.3.2.tgz#e75bd5f6e268122a2a0e0bda630b2550c166502c"
[email protected]:
+ version "6.7.0"
+ resolved "https://registry.yarnpkg.com/qs/-/qs-6.7.0.tgz#41dc1a015e3d581f1621776be31afb2876a9b1bc"
+ integrity sha512-VCdBRNFTX1fyE7Nb6FYoURo/SPe62QCaAyzJvUjwRaIsc+NePBEniHlvxFmmX56+HZphIGtV0XeCirBtpDrTyQ==
-qs@~6.5.1:
+qs@~6.5.2:
version "6.5.2"
- resolved "http://registry.npm.taobao.org/qs/download/qs-6.5.2.tgz#cb3ae806e8740444584ef154ce8ee98d403f3e36"
+ resolved "https://registry.yarnpkg.com/qs/-/qs-6.5.2.tgz#cb3ae806e8740444584ef154ce8ee98d403f3e36"
+ integrity sha512-N5ZAX4/LxJmF+7wN74pUD6qAh9/wnvdQcjq9TZjevvXzSUo7bfmw91saqMjzGS2xq91/odN2dW/WOl7qQHNDGA==
-query-string@^4.1.0:
- version "4.3.4"
- resolved "http://registry.npm.taobao.org/query-string/download/query-string-4.3.4.tgz#bbb693b9ca915c232515b228b1a02b609043dbeb"
+query-string@^5.0.1:
+ version "5.1.1"
+ resolved "https://registry.yarnpkg.com/query-string/-/query-string-5.1.1.tgz#a78c012b71c17e05f2e3fa2319dd330682efb3cb"
+ integrity sha512-gjWOsm2SoGlgLEdAGt7a6slVOk9mGiXmPFMqrEhLQ68rhQuBnpfs3+EmlvqKyxnCo9/PPlF+9MtY02S1aFg+Jw==
dependencies:
+ decode-uri-component "^0.2.0"
object-assign "^4.1.0"
strict-uri-encode "^1.0.0"
querystring-es3@^0.2.0:
version "0.2.1"
- resolved "http://registry.npm.taobao.org/querystring-es3/download/querystring-es3-0.2.1.tgz#9ec61f79049875707d69414596fd907a4d711e73"
+ resolved "https://registry.yarnpkg.com/querystring-es3/-/querystring-es3-0.2.1.tgz#9ec61f79049875707d69414596fd907a4d711e73"
+ integrity sha1-nsYfeQSYdXB9aUFFlv2Qek1xHnM=
[email protected]:
version "0.2.0"
- resolved "http://registry.npm.taobao.org/querystring/download/querystring-0.2.0.tgz#b209849203bb25df820da756e747005878521620"
+ resolved "https://registry.yarnpkg.com/querystring/-/querystring-0.2.0.tgz#b209849203bb25df820da756e747005878521620"
+ integrity sha1-sgmEkgO7Jd+CDadW50cAWHhSFiA=
-querystringify@^2.0.0:
- version "2.0.0"
- resolved "http://registry.npm.taobao.org/querystringify/download/querystringify-2.0.0.tgz#fa3ed6e68eb15159457c89b37bc6472833195755"
+querystringify@^2.1.1:
+ version "2.1.1"
+ resolved "https://registry.yarnpkg.com/querystringify/-/querystringify-2.1.1.tgz#60e5a5fd64a7f8bfa4d2ab2ed6fdf4c85bad154e"
+ integrity sha512-w7fLxIRCRT7U8Qu53jQnJyPkYZIaR4n5151KMfcJlO/A9397Wxb1amJvROTK6TOnp7PfoAmg/qXiNHI+08jRfA==
quick-lru@^1.0.0:
version "1.1.0"
- resolved "http://registry.npm.taobao.org/quick-lru/download/quick-lru-1.1.0.tgz#4360b17c61136ad38078397ff11416e186dcfbb8"
-
[email protected], raf@^3.4.0:
- version "3.4.0"
- resolved "http://registry.npm.taobao.org/raf/download/raf-3.4.0.tgz#a28876881b4bc2ca9117d4138163ddb80f781575"
- dependencies:
- performance-now "^2.1.0"
-
-railroad-diagrams@^1.0.0:
- version "1.0.0"
- resolved "http://registry.npm.taobao.org/railroad-diagrams/download/railroad-diagrams-1.0.0.tgz#eb7e6267548ddedfb899c1b90e57374559cddb7e"
-
[email protected]:
- version "0.4.6"
- resolved "http://registry.npm.taobao.org/randexp/download/randexp-0.4.6.tgz#e986ad5e5e31dae13ddd6f7b3019aa7c87f60ca3"
- dependencies:
- discontinuous-range "1.0.0"
- ret "~0.1.10"
-
-randomatic@^3.0.0:
- version "3.0.0"
- resolved "http://registry.npm.taobao.org/randomatic/download/randomatic-3.0.0.tgz#d35490030eb4f7578de292ce6dfb04a91a128923"
- dependencies:
- is-number "^4.0.0"
- kind-of "^6.0.0"
- math-random "^1.0.1"
+ resolved "https://registry.yarnpkg.com/quick-lru/-/quick-lru-1.1.0.tgz#4360b17c61136ad38078397ff11416e186dcfbb8"
+ integrity sha1-Q2CxfGETatOAeDl/8RQW4Ybc+7g=
randombytes@^2.0.0, randombytes@^2.0.1, randombytes@^2.0.5:
- version "2.0.6"
- resolved "http://registry.npm.taobao.org/randombytes/download/randombytes-2.0.6.tgz#d302c522948588848a8d300c932b44c24231da80"
+ version "2.1.0"
+ resolved "https://registry.yarnpkg.com/randombytes/-/randombytes-2.1.0.tgz#df6f84372f0270dc65cdf6291349ab7a473d4f2a"
+ integrity sha512-vYl3iOX+4CKUWuxGi9Ukhie6fsqXqS9FE2Zaic4tNFD2N2QQaXOMFbuKK4QmDHC0JO6B1Zp41J0LpT0oR68amQ==
dependencies:
safe-buffer "^5.1.0"
randomfill@^1.0.3:
version "1.0.4"
- resolved "http://registry.npm.taobao.org/randomfill/download/randomfill-1.0.4.tgz#c92196fc86ab42be983f1bf31778224931d61458"
+ resolved "https://registry.yarnpkg.com/randomfill/-/randomfill-1.0.4.tgz#c92196fc86ab42be983f1bf31778224931d61458"
+ integrity sha512-87lcbR8+MhcWcUiQ+9e+Rwx8MyR2P7qnt15ynUlbm3TU/fjbgz4GsvfSUDTemtCCtVCqb4ZcEFlyPNTh9bBTLw==
dependencies:
randombytes "^2.0.5"
safe-buffer "^5.1.0"
-range-parser@^1.0.3, range-parser@~1.2.0:
- version "1.2.0"
- resolved "http://registry.npm.taobao.org/range-parser/download/range-parser-1.2.0.tgz#f49be6b487894ddc40dcc94a322f611092e00d5e"
+range-parser@^1.2.1, range-parser@~1.2.1:
+ version "1.2.1"
+ resolved "https://registry.yarnpkg.com/range-parser/-/range-parser-1.2.1.tgz#3cf37023d199e1c24d1a55b84800c2f3e6468031"
+ integrity sha512-Hrgsx+orqoygnmhFbKaHE6c296J+HTAQXoxEF6gNupROmmGJRoyzfG3ccAveqCBrwr/2yxQ5BVd/GTl5agOwSg==
[email protected]:
- version "2.3.2"
- resolved "http://registry.npm.taobao.org/raw-body/download/raw-body-2.3.2.tgz#bcd60c77d3eb93cde0050295c3f379389bc88f89"
[email protected]:
+ version "2.4.0"
+ resolved "https://registry.yarnpkg.com/raw-body/-/raw-body-2.4.0.tgz#a1ce6fb9c9bc356ca52e89256ab59059e13d0332"
+ integrity sha512-4Oz8DUIwdvoa5qMJelxipzi/iJIi40O5cGV1wNYp5hvZP8ZN0T+jiNkL0QepXs+EsQ9XJ8ipEDoiH70ySUJP3Q==
dependencies:
- bytes "3.0.0"
- http-errors "1.6.2"
- iconv-lite "0.4.19"
+ bytes "3.1.0"
+ http-errors "1.7.2"
+ iconv-lite "0.4.24"
unpipe "1.0.0"
-raw-loader@^0.5.1:
- version "0.5.1"
- resolved "http://registry.npm.taobao.org/raw-loader/download/raw-loader-0.5.1.tgz#0c3d0beaed8a01c966d9787bf778281252a979aa"
-
[email protected]:
- version "2.3.6"
- resolved "http://registry.npm.taobao.org/rc-align/download/rc-align-2.3.6.tgz#35046d2ac25771b1e5cbd600eae8f862c450f9e6"
- dependencies:
- babel-runtime "^6.26.0"
- dom-align "1.x"
- prop-types "^15.5.8"
- rc-util "^4.0.4"
- shallowequal "^1.0.2"
-
-rc-align@^2.4.0, rc-align@^2.4.1:
- version "2.4.3"
- resolved "http://registry.npm.taobao.org/rc-align/download/rc-align-2.4.3.tgz#b9b3c2a6d68adae71a8e1d041cd5e3b2a655f99a"
- integrity sha1-ubPCptaK2ucajh0EHNXjsqZV+Zo=
- dependencies:
- babel-runtime "^6.26.0"
- dom-align "^1.7.0"
- prop-types "^15.5.8"
- rc-util "^4.0.4"
-
[email protected], rc-animate@^2.3.0:
- version "2.4.4"
- resolved "http://registry.npm.taobao.org/rc-animate/download/rc-animate-2.4.4.tgz#a05a784c747beef140d99ff52b6117711bef4b1e"
- dependencies:
- babel-runtime "6.x"
- css-animation "^1.3.2"
- prop-types "15.x"
-
-rc-animate@^2.4.1:
- version "2.6.0"
- resolved "http://registry.npm.taobao.org/rc-animate/download/rc-animate-2.6.0.tgz#ca8440d042781af7a1329d84f97ea94794c5ec15"
- integrity sha1-yoRA0EJ4GvehMp2E+X6pR5TF7BU=
- dependencies:
- babel-runtime "6.x"
- classnames "^2.2.6"
- css-animation "^1.3.2"
- prop-types "15.x"
- raf "^3.4.0"
- react-lifecycles-compat "^3.0.4"
-
-rc-animate@^3.0.0-rc.1, rc-animate@^3.0.0-rc.4:
- version "3.0.0-rc.6"
- resolved "http://registry.npm.taobao.org/rc-animate/download/rc-animate-3.0.0-rc.6.tgz#04288eefa118e0cae214536c8a903ffaac1bc3fb"
- integrity sha1-BCiO76EY4MriFFNsipA/+qwbw/s=
- dependencies:
- babel-runtime "6.x"
- classnames "^2.2.5"
- component-classes "^1.2.6"
- fbjs "^0.8.16"
- prop-types "15.x"
- raf "^3.4.0"
- rc-util "^4.5.0"
- react-lifecycles-compat "^3.0.4"
-
-rc-calendar@~9.6.0:
- version "9.6.2"
- resolved "http://registry.npm.taobao.org/rc-calendar/download/rc-calendar-9.6.2.tgz#c7309db41225f4b8c81d5a1dcbe46d8ce07b6aee"
- integrity sha1-xzCdtBIl9LjIHVody+RtjOB7au4=
- dependencies:
- babel-runtime "6.x"
- classnames "2.x"
- create-react-class "^15.5.2"
- moment "2.x"
- prop-types "^15.5.8"
- rc-trigger "^2.2.0"
- rc-util "^4.1.1"
-
-rc-cascader@~0.14.0:
- version "0.14.0"
- resolved "http://registry.npm.taobao.org/rc-cascader/download/rc-cascader-0.14.0.tgz#a956c99896f10883bf63d46fb894d0cb326842a4"
- integrity sha1-qVbJmJbxCIO/Y9RvuJTQyzJoQqQ=
- dependencies:
- array-tree-filter "^1.0.0"
- prop-types "^15.5.8"
- rc-trigger "^2.2.0"
- rc-util "^4.0.4"
- shallow-equal "^1.0.0"
- warning "^4.0.1"
-
-rc-checkbox@~2.1.5:
- version "2.1.5"
- resolved "http://registry.npm.taobao.org/rc-checkbox/download/rc-checkbox-2.1.5.tgz#411858448c0ee2a797ef8544dac63bcaeef722ef"
- dependencies:
- babel-runtime "^6.23.0"
- classnames "2.x"
- prop-types "15.x"
- rc-util "^4.0.4"
-
-rc-collapse@~1.9.0:
- version "1.9.3"
- resolved "http://registry.npm.taobao.org/rc-collapse/download/rc-collapse-1.9.3.tgz#d9741db06a823353e1fd1aec3ba4c0f9d8af4b26"
- integrity sha1-2XQdsGqCM1Ph/RrsO6TA+divSyY=
- dependencies:
- classnames "2.x"
- css-animation "1.x"
- prop-types "^15.5.6"
- rc-animate "2.x"
-
-rc-dialog@~7.1.0:
- version "7.1.8"
- resolved "http://registry.npm.taobao.org/rc-dialog/download/rc-dialog-7.1.8.tgz#5402748a256de2e19ad590f743950c823c6df6b5"
- integrity sha1-VAJ0iiVt4uGa1ZD3Q5UMgjxt9rU=
- dependencies:
- babel-runtime "6.x"
- rc-animate "2.x"
- rc-util "^4.4.0"
-
-rc-drawer@~1.6.2:
- version "1.6.3"
- resolved "http://registry.npm.taobao.org/rc-drawer/download/rc-drawer-1.6.3.tgz#f866b7fbde2d307b59cfd06c015ae697017db388"
- integrity sha1-+Ga3+94tMHtZz9BsAVrmlwF9s4g=
- dependencies:
- babel-runtime "6.x"
- classnames "^2.2.5"
- prop-types "^15.5.0"
- rc-util "^4.5.1"
-
-rc-dropdown@~2.2.0:
- version "2.2.1"
- resolved "http://registry.npm.taobao.org/rc-dropdown/download/rc-dropdown-2.2.1.tgz#172b6e87f0909fe8ab983e375f62e2866f3250c3"
- integrity sha1-Fytuh/CQn+irmD43X2Lihm8yUMM=
- dependencies:
- babel-runtime "^6.26.0"
- prop-types "^15.5.8"
- rc-trigger "^2.5.1"
- react-lifecycles-compat "^3.0.2"
-
-rc-editor-core@~0.8.3:
- version "0.8.6"
- resolved "http://registry.npm.taobao.org/rc-editor-core/download/rc-editor-core-0.8.6.tgz#e48b288286effb3272cbc9c6f801450dcdb0b247"
- dependencies:
- babel-runtime "^6.26.0"
- classnames "^2.2.5"
- draft-js "^0.10.0"
- immutable "^3.7.4"
- lodash "^4.16.5"
- prop-types "^15.5.8"
- setimmediate "^1.0.5"
-
-rc-editor-mention@^1.0.2:
- version "1.1.12"
- resolved "http://registry.npm.taobao.org/rc-editor-mention/download/rc-editor-mention-1.1.12.tgz#896bcb172112f18812e96fdd33ba603c0fc7306a"
- integrity sha1-iWvLFyES8YgS6W/dM7pgPA/HMGo=
- dependencies:
- babel-runtime "^6.23.0"
- classnames "^2.2.5"
- dom-scroll-into-view "^1.2.0"
- draft-js "~0.10.0"
- immutable "^3.7.4"
- prop-types "^15.5.8"
- rc-animate "^2.3.0"
- rc-editor-core "~0.8.3"
-
-rc-form@^2.1.0:
- version "2.4.1"
- resolved "http://registry.npm.taobao.org/rc-form/download/rc-form-2.4.1.tgz#b1685533d13cbdf2a2ba2051ebdc30f3d9c3a8dd"
- integrity sha1-sWhVM9E8vfKiuiBR69ww89nDqN0=
- dependencies:
- async-validator "~1.8.5"
- babel-runtime "6.x"
- create-react-class "^15.5.3"
- dom-scroll-into-view "1.x"
- hoist-non-react-statics "^2.3.1"
- lodash "^4.17.4"
- warning "^3.0.0"
-
-rc-hammerjs@~0.6.0:
- version "0.6.9"
- resolved "http://registry.npm.taobao.org/rc-hammerjs/download/rc-hammerjs-0.6.9.tgz#9a4ddbda1b2ec8f9b9596091a6a989842a243907"
- dependencies:
- babel-runtime "6.x"
- hammerjs "^2.0.8"
- prop-types "^15.5.9"
-
-rc-input-number@~4.0.0:
- version "4.0.13"
- resolved "http://registry.npm.taobao.org/rc-input-number/download/rc-input-number-4.0.13.tgz#18ac305bf07b6771ad0e4edc97b1e1bbb9b71918"
- integrity sha1-GKwwW/B7Z3GtDk7cl7Hhu7m3GRg=
- dependencies:
- babel-runtime "6.x"
- classnames "^2.2.0"
- is-negative-zero "^2.0.0"
- prop-types "^15.5.7"
- rc-util "^4.5.1"
- rmc-feedback "^2.0.0"
-
-rc-menu@^7.0.2:
- version "7.4.21"
- resolved "http://registry.npm.taobao.org/rc-menu/download/rc-menu-7.4.21.tgz#8a728afd8db81312c913511b6502d9de596d72fd"
- integrity sha1-inKK/Y24ExLJE1EbZQLZ3lltcv0=
- dependencies:
- babel-runtime "6.x"
- classnames "2.x"
- dom-scroll-into-view "1.x"
- ismobilejs "^0.5.1"
- mini-store "^2.0.0"
- mutationobserver-shim "^0.3.2"
- prop-types "^15.5.6"
- rc-animate "2.x"
- rc-trigger "^2.3.0"
- rc-util "^4.1.0"
- resize-observer-polyfill "^1.5.0"
-
-rc-menu@~7.0.2:
- version "7.0.5"
- resolved "http://registry.npm.taobao.org/rc-menu/download/rc-menu-7.0.5.tgz#986b65df5ad227aadf399ea374b98d2313802316"
- integrity sha1-mGtl31rSJ6rfOZ6jdLmNIxOAIxY=
- dependencies:
- babel-runtime "6.x"
- classnames "2.x"
- dom-scroll-into-view "1.x"
- mini-store "^1.1.0"
- prop-types "^15.5.6"
- rc-animate "2.x"
- rc-trigger "^2.3.0"
- rc-util "^4.1.0"
-
-rc-notification@~3.1.1:
- version "3.1.1"
- resolved "http://registry.npm.taobao.org/rc-notification/download/rc-notification-3.1.1.tgz#14eac6730db1d59adaf569dad9fe82a2f33cd23a"
- integrity sha1-FOrGcw2x1Zra9Wna2f6CovM80jo=
- dependencies:
- babel-runtime "6.x"
- classnames "2.x"
- prop-types "^15.5.8"
- rc-animate "2.x"
- rc-util "^4.0.4"
-
-rc-pagination@~1.16.1:
- version "1.16.5"
- resolved "http://registry.npm.taobao.org/rc-pagination/download/rc-pagination-1.16.5.tgz#550a758035e1957ccfa2f71ee6e55657da729679"
- integrity sha1-VQp1gDXhlXzPovce5uVWV9pylnk=
- dependencies:
- babel-runtime "6.x"
- prop-types "^15.5.7"
-
-rc-progress@~2.2.2:
- version "2.2.7"
- resolved "http://registry.npm.taobao.org/rc-progress/download/rc-progress-2.2.7.tgz#e650928c83f54da876f39b957a680afa01b490f8"
- integrity sha1-5lCSjIP1Tah285uVemgK+gG0kPg=
- dependencies:
- babel-runtime "6.x"
- prop-types "^15.5.8"
-
-rc-rate@~2.4.0:
- version "2.4.3"
- resolved "http://registry.npm.taobao.org/rc-rate/download/rc-rate-2.4.3.tgz#70434905faf84c9a0694bec4bdbd9b9a9099318f"
- integrity sha1-cENJBfr4TJoGlL7Evb2bmpCZMY8=
- dependencies:
- babel-runtime "^6.26.0"
- classnames "^2.2.5"
- prop-types "^15.5.8"
- rc-util "^4.3.0"
- react-lifecycles-compat "^3.0.4"
-
-rc-select@~8.0.7:
- version "8.0.14"
- resolved "http://registry.npm.taobao.org/rc-select/download/rc-select-8.0.14.tgz#ff1763458a15519bea010ea15fecf6f59095b346"
- integrity sha1-/xdjRYoVUZvqAQ6hX+z29ZCVs0Y=
- dependencies:
- babel-runtime "^6.23.0"
- classnames "2.x"
- component-classes "1.x"
- dom-scroll-into-view "1.x"
- prop-types "^15.5.8"
- rc-animate "2.x"
- rc-menu "^7.0.2"
- rc-trigger "^2.2.0"
- rc-util "^4.0.4"
- react-lifecycles-compat "^3.0.2"
- warning "^3.0.0"
-
-rc-slider@~8.6.0:
- version "8.6.4"
- resolved "http://registry.npm.taobao.org/rc-slider/download/rc-slider-8.6.4.tgz#b9d9000180f2b89bb71b58717753164b479fc75f"
- integrity sha1-udkAAYDyuJu3G1hxd1MWS0efx18=
- dependencies:
- babel-runtime "6.x"
- classnames "^2.2.5"
- prop-types "^15.5.4"
- rc-tooltip "^3.7.0"
- rc-util "^4.0.4"
- shallowequal "^1.0.1"
- warning "^3.0.0"
-
-rc-steps@~3.1.0:
- version "3.1.1"
- resolved "http://registry.npm.taobao.org/rc-steps/download/rc-steps-3.1.1.tgz#79583ad808309d82b8e011676321d153fd7ca403"
- integrity sha1-eVg62AgwnYK44BFnYyHRU/18pAM=
- dependencies:
- babel-runtime "^6.23.0"
- classnames "^2.2.3"
- lodash "^4.17.5"
- prop-types "^15.5.7"
-
-rc-switch@~1.6.0:
- version "1.6.0"
- resolved "http://registry.npm.taobao.org/rc-switch/download/rc-switch-1.6.0.tgz#c2d7369bdb87c1fd45e84989a27c1fb2f201d2fd"
- integrity sha1-wtc2m9uHwf1F6EmJonwfsvIB0v0=
- dependencies:
- babel-runtime "^6.23.0"
- classnames "^2.2.1"
- prop-types "^15.5.6"
-
-rc-table@~6.2.2:
- version "6.2.9"
- resolved "http://registry.npm.taobao.org/rc-table/download/rc-table-6.2.9.tgz#d82b6f35f3052dd344e4e9821d92ee5d27620997"
- integrity sha1-2CtvNfMFLdNE5OmCHZLuXSdiCZc=
- dependencies:
- babel-runtime "6.x"
- classnames "^2.2.5"
- component-classes "^1.2.6"
- lodash "^4.17.5"
- mini-store "^1.0.2"
- prop-types "^15.5.8"
- rc-util "^4.0.4"
- react-lifecycles-compat "^3.0.2"
- shallowequal "^1.0.2"
- warning "^3.0.0"
-
-rc-tabs@~9.2.0:
- version "9.2.6"
- resolved "http://registry.npm.taobao.org/rc-tabs/download/rc-tabs-9.2.6.tgz#4bd88086496b4f2d19c75c832fe7ec08e6b1643d"
- integrity sha1-S9iAhklrTy0Zx1yDL+fsCOaxZD0=
- dependencies:
- babel-runtime "6.x"
- classnames "2.x"
- create-react-class "15.x"
- lodash "^4.17.5"
- prop-types "15.x"
- rc-hammerjs "~0.6.0"
- rc-util "^4.0.4"
- warning "^3.0.0"
-
-rc-time-picker@~3.3.0:
- version "3.3.1"
- resolved "http://registry.npm.taobao.org/rc-time-picker/download/rc-time-picker-3.3.1.tgz#94f8bbd51e6b93de1f01e78064aef1e6d765b367"
- integrity sha1-lPi71R5rk94fAeeAZK7x5tdls2c=
- dependencies:
- babel-runtime "6.x"
- classnames "2.x"
- moment "2.x"
- prop-types "^15.5.8"
- rc-trigger "^2.2.0"
-
-rc-tooltip@^3.7.0:
- version "3.7.2"
- resolved "http://registry.npm.taobao.org/rc-tooltip/download/rc-tooltip-3.7.2.tgz#3698656d4bacd51b72d9e327bed15d1d5a9f1b27"
- dependencies:
- babel-runtime "6.x"
- prop-types "^15.5.8"
- rc-trigger "^2.2.2"
-
-rc-tooltip@~3.7.0:
- version "3.7.3"
- resolved "http://registry.npm.taobao.org/rc-tooltip/download/rc-tooltip-3.7.3.tgz#280aec6afcaa44e8dff0480fbaff9e87fc00aecc"
- integrity sha1-KArsavyqROjf8EgPuv+eh/wArsw=
- dependencies:
- babel-runtime "6.x"
- prop-types "^15.5.8"
- rc-trigger "^2.2.2"
-
-rc-tree-select@~2.0.5:
- version "2.0.14"
- resolved "http://registry.npm.taobao.org/rc-tree-select/download/rc-tree-select-2.0.14.tgz#6b76c50f32ebe9aeb720f98ce36b43b3e8be11d2"
- integrity sha1-a3bFDzLr6a63IPmM42tDs+i+EdI=
- dependencies:
- babel-runtime "^6.23.0"
- classnames "^2.2.1"
- prop-types "^15.5.8"
- raf "^3.4.0"
- rc-animate "^3.0.0-rc.4"
- rc-tree "~1.12.2"
- rc-trigger "^3.0.0-rc.2"
- rc-util "^4.5.0"
- react-lifecycles-compat "^3.0.4"
- shallowequal "^1.0.2"
- warning "^4.0.1"
-
-rc-tree@~1.12.0, rc-tree@~1.12.2:
- version "1.12.7"
- resolved "http://registry.npm.taobao.org/rc-tree/download/rc-tree-1.12.7.tgz#94ce4b59d27325c555d6238c7b92feeaa5d476a0"
- integrity sha1-lM5LWdJzJcVV1iOMe5L+6qXUdqA=
- dependencies:
- babel-runtime "^6.23.0"
- classnames "2.x"
- prop-types "^15.5.8"
- rc-animate "2.x"
- rc-util "^4.0.4"
- warning "^3.0.0"
-
-rc-trigger@^2.2.0, rc-trigger@^2.2.2, rc-trigger@^2.3.0:
- version "2.4.2"
- resolved "http://registry.npm.taobao.org/rc-trigger/download/rc-trigger-2.4.2.tgz#8274249b3af51ff2c9c8a0c403d68e17bc775d7e"
- dependencies:
- babel-runtime "6.x"
- prop-types "15.x"
- rc-align "2.x"
- rc-animate "2.x"
- rc-util "^4.4.0"
-
-rc-trigger@^2.5.1, rc-trigger@^2.5.4:
- version "2.6.2"
- resolved "http://registry.npm.taobao.org/rc-trigger/download/rc-trigger-2.6.2.tgz#a9c09ba5fad63af3b2ec46349c7db6cb46657001"
- integrity sha1-qcCbpfrWOvOy7EY0nH22y0ZlcAE=
- dependencies:
- babel-runtime "6.x"
- classnames "^2.2.6"
- prop-types "15.x"
- rc-align "^2.4.0"
- rc-animate "2.x"
- rc-util "^4.4.0"
-
-rc-trigger@^3.0.0-rc.2:
- version "3.0.0-rc.3"
- resolved "http://registry.npm.taobao.org/rc-trigger/download/rc-trigger-3.0.0-rc.3.tgz#35842df1674d25315e1426a44882a4c97652258b"
- integrity sha1-NYQt8WdNJTFeFCakSIKkyXZSJYs=
- dependencies:
- babel-runtime "6.x"
- classnames "^2.2.6"
- prop-types "15.x"
- raf "^3.4.0"
- rc-align "^2.4.1"
- rc-animate "^3.0.0-rc.1"
- rc-util "^4.4.0"
-
-rc-upload@~2.5.0:
- version "2.5.1"
- resolved "http://registry.npm.taobao.org/rc-upload/download/rc-upload-2.5.1.tgz#7ae0c9038d98ba8750e9466d8f969e1b4bc9f0e0"
- integrity sha1-euDJA42YuodQ6UZtj5aeG0vJ8OA=
- dependencies:
- babel-runtime "6.x"
- classnames "^2.2.5"
- prop-types "^15.5.7"
- warning "2.x"
-
-rc-util@^4.0.4, rc-util@^4.1.0, rc-util@^4.1.1, rc-util@^4.3.0, rc-util@^4.4.0, rc-util@^4.5.0:
- version "4.5.0"
- resolved "http://registry.npm.taobao.org/rc-util/download/rc-util-4.5.0.tgz#3183e6ec806f382efb2d3e85770d95875fa6180f"
- dependencies:
- add-dom-event-listener "1.x"
- babel-runtime "6.x"
- prop-types "^15.5.10"
- shallowequal "^0.2.2"
-
-rc-util@^4.5.1:
- version "4.6.0"
- resolved "http://registry.npm.taobao.org/rc-util/download/rc-util-4.6.0.tgz#ba33721783192ec4f3afb259e182b04e55deb7f6"
- integrity sha1-ujNyF4MZLsTzr7JZ4YKwTlXet/Y=
- dependencies:
- add-dom-event-listener "^1.1.0"
- babel-runtime "6.x"
- prop-types "^15.5.10"
- shallowequal "^0.2.2"
-
-rc@^1.1.7:
+rc@^1.2.7:
version "1.2.8"
- resolved "http://registry.npm.taobao.org/rc/download/rc-1.2.8.tgz#cd924bf5200a075b83c188cd6b9e211b7fc0d3ed"
+ resolved "https://registry.yarnpkg.com/rc/-/rc-1.2.8.tgz#cd924bf5200a075b83c188cd6b9e211b7fc0d3ed"
+ integrity sha512-y3bGgqKj3QBdxLbLkomlohkvsA8gdAiUQlSBJnBhfn+BPxg4bc62d8TcBW15wavDfgexCgccckhcZvywyQYPOw==
dependencies:
deep-extend "^0.6.0"
ini "~1.3.0"
minimist "^1.2.0"
strip-json-comments "~2.0.1"
-react-clickdrag@^3.0.2:
- version "3.0.2"
- resolved "https://registry.npm.taobao.org/react-clickdrag/download/react-clickdrag-3.0.2.tgz#54df5f3df6d695c54e9978a08253f83de7611bd2"
- integrity sha1-VN9fPfbWlcVOmXigglP4PedhG9I=
-
-react-dev-utils@^5.0.0:
- version "5.0.1"
- resolved "http://registry.npm.taobao.org/react-dev-utils/download/react-dev-utils-5.0.1.tgz#1f396e161fe44b595db1b186a40067289bf06613"
- dependencies:
- address "1.0.3"
- babel-code-frame "6.26.0"
- chalk "1.1.3"
- cross-spawn "5.1.0"
- detect-port-alt "1.1.6"
- escape-string-regexp "1.0.5"
- filesize "3.5.11"
- global-modules "1.0.0"
- gzip-size "3.0.0"
- inquirer "3.3.0"
- is-root "1.0.0"
- opn "5.2.0"
- react-error-overlay "^4.0.0"
- recursive-readdir "2.2.1"
- shell-quote "1.6.1"
- sockjs-client "1.1.4"
- strip-ansi "3.0.1"
- text-table "0.2.0"
-
-react-dom@^16.4.0:
- version "16.4.0"
- resolved "http://registry.npm.taobao.org/react-dom/download/react-dom-16.4.0.tgz#099f067dd5827ce36a29eaf9a6cdc7cbf6216b1e"
- dependencies:
- fbjs "^0.8.16"
- loose-envify "^1.1.0"
- object-assign "^4.1.1"
- prop-types "^15.6.0"
-
-react-error-overlay@^4.0.0:
- version "4.0.0"
- resolved "http://registry.npm.taobao.org/react-error-overlay/download/react-error-overlay-4.0.0.tgz#d198408a85b4070937a98667f500c832f86bd5d4"
-
-react-i18next@^7.6.0:
- version "7.6.1"
- resolved "http://registry.npm.taobao.org/react-i18next/download/react-i18next-7.6.1.tgz#c61d8284f3c695893d51033f67c39e65f01212b6"
- dependencies:
- hoist-non-react-statics "^2.3.1"
- html-parse-stringify2 "2.0.1"
- prop-types "^15.6.0"
-
-react-is@^16.4.0:
- version "16.4.0"
- resolved "http://registry.npm.taobao.org/react-is/download/react-is-16.4.0.tgz#cc9fdc855ac34d2e7d9d2eb7059bbc240d35ffcf"
-
-react-lazy-load@^3.0.12:
- version "3.0.13"
- resolved "http://registry.npm.taobao.org/react-lazy-load/download/react-lazy-load-3.0.13.tgz#3b0a92d336d43d3f0d73cbe6f35b17050b08b824"
- integrity sha1-OwqS0zbUPT8Nc8vm81sXBQsIuCQ=
- dependencies:
- eventlistener "0.0.1"
- lodash.debounce "^4.0.0"
- lodash.throttle "^4.0.0"
- prop-types "^15.5.8"
-
-react-lifecycles-compat@^3.0.2, react-lifecycles-compat@^3.0.4:
- version "3.0.4"
- resolved "http://registry.npm.taobao.org/react-lifecycles-compat/download/react-lifecycles-compat-3.0.4.tgz#4f1a273afdfc8f3488a8c516bfda78f872352362"
-
-react-number-editor@^4.0.3:
- version "4.0.3"
- resolved "https://registry.npm.taobao.org/react-number-editor/download/react-number-editor-4.0.3.tgz#3b2b2310910060a41418453299813c5acd3161c7"
- integrity sha1-OysjEJEAYKQUGEUymYE8Ws0xYcc=
- dependencies:
- clamp "^1.0.1"
- prop-types "^15.6.0"
- react-clickdrag "^3.0.2"
-
-react-reconciler@^0.7.0:
- version "0.7.0"
- resolved "http://registry.npm.taobao.org/react-reconciler/download/react-reconciler-0.7.0.tgz#9614894103e5f138deeeb5eabaf3ee80eb1d026d"
+react-dom@^16:
+ version "16.8.6"
+ resolved "https://registry.yarnpkg.com/react-dom/-/react-dom-16.8.6.tgz#71d6303f631e8b0097f56165ef608f051ff6e10f"
+ integrity sha512-1nL7PIq9LTL3fthPqwkvr2zY7phIPjYrT0jp4HjyEQrEROnw4dG41VVwi/wfoCneoleqrNX7iAD+pXebJZwrwA==
dependencies:
- fbjs "^0.8.16"
loose-envify "^1.1.0"
object-assign "^4.1.1"
- prop-types "^15.6.0"
-
-react-redux@^5.0.7:
- version "5.0.7"
- resolved "http://registry.npm.taobao.org/react-redux/download/react-redux-5.0.7.tgz#0dc1076d9afb4670f993ffaef44b8f8c1155a4c8"
- dependencies:
- hoist-non-react-statics "^2.5.0"
- invariant "^2.0.0"
- lodash "^4.17.5"
- lodash-es "^4.17.5"
- loose-envify "^1.1.0"
- prop-types "^15.6.0"
-
-react-slick@~0.23.1:
- version "0.23.2"
- resolved "http://registry.npm.taobao.org/react-slick/download/react-slick-0.23.2.tgz#8d8bdbc77a6678e8ad36f50c32578c7c0f1c54f6"
- integrity sha1-jYvbx3pmeOitNvUMMleMfA8cVPY=
- dependencies:
- classnames "^2.2.5"
- enquire.js "^2.1.6"
- json2mq "^0.2.0"
- lodash.debounce "^4.0.8"
- prettier "^1.14.3"
- resize-observer-polyfill "^1.5.0"
+ prop-types "^15.6.2"
+ scheduler "^0.13.6"
-react-sortable-hoc@^1.4.0:
- version "1.4.0"
- resolved "http://registry.npm.taobao.org/react-sortable-hoc/download/react-sortable-hoc-1.4.0.tgz#b477ce700ba755754200a1dabd36e588e2f5608d"
- integrity sha1-tHfOcAunVXVCAKHavTbliOL1YI0=
+react-hot-loader@^4:
+ version "4.12.3"
+ resolved "https://registry.yarnpkg.com/react-hot-loader/-/react-hot-loader-4.12.3.tgz#0972255cd110a00860902e82bb2b789a262cfe01"
+ integrity sha512-XBhxogFOxEh8L4Ykdk2mp704Xc/eoy+bwadEYMvmBhjAz3wg+DfMpINMkA+kLTRDinqwjssDfA9DhUJznRjvuA==
dependencies:
- "@babel/runtime" "^7.2.0"
- invariant "^2.2.4"
- prop-types "^15.5.7"
+ fast-levenshtein "^2.0.6"
+ global "^4.3.0"
+ hoist-non-react-statics "^3.3.0"
+ loader-utils "^1.1.0"
+ lodash "^4.17.11"
+ prop-types "^15.6.1"
+ react-lifecycles-compat "^3.0.4"
+ shallowequal "^1.0.2"
+ source-map "^0.7.3"
-react-test-renderer@^16.0.0-0:
- version "16.4.0"
- resolved "http://registry.npm.taobao.org/react-test-renderer/download/react-test-renderer-16.4.0.tgz#0dbe0e24263e94e1830c7afb1f403707fad313a3"
- dependencies:
- fbjs "^0.8.16"
- object-assign "^4.1.1"
- prop-types "^15.6.0"
- react-is "^16.4.0"
+react-is@^16.7.0, react-is@^16.8.1, react-is@^16.8.4:
+ version "16.8.6"
+ resolved "https://registry.yarnpkg.com/react-is/-/react-is-16.8.6.tgz#5bbc1e2d29141c9fbdfed456343fe2bc430a6a16"
+ integrity sha512-aUk3bHfZ2bRSVFFbbeVS4i+lNPZr3/WM5jT2J5omUVV1zzcs1nAaf3l51ctA5FFvCRbhrH0bdAsRRQddFJZPtA==
-react-transition-group@^2.3.1:
- version "2.3.1"
- resolved "http://registry.npm.taobao.org/react-transition-group/download/react-transition-group-2.3.1.tgz#31d611b33e143a5e0f2d94c348e026a0f3b474b6"
- dependencies:
- dom-helpers "^3.3.1"
- loose-envify "^1.3.1"
- prop-types "^15.6.1"
+react-lifecycles-compat@^3.0.4:
+ version "3.0.4"
+ resolved "https://registry.yarnpkg.com/react-lifecycles-compat/-/react-lifecycles-compat-3.0.4.tgz#4f1a273afdfc8f3488a8c516bfda78f872352362"
+ integrity sha512-fBASbA6LnOU9dOU2eW7aQ8xmYBSXUIWr+UmF9b1efZBazGNO+rcXT/icdKnYm2pTwcRylVUYwW7H1PHfLekVzA==
-react@^16.4.0:
- version "16.4.0"
- resolved "http://registry.npm.taobao.org/react/download/react-16.4.0.tgz#402c2db83335336fba1962c08b98c6272617d585"
+react@^16:
+ version "16.8.6"
+ resolved "https://registry.yarnpkg.com/react/-/react-16.8.6.tgz#ad6c3a9614fd3a4e9ef51117f54d888da01f2bbe"
+ integrity sha512-pC0uMkhLaHm11ZSJULfOBqV4tIZkx87ZLvbbQYunNixAAvjnC+snJCg0XQXn9VIsttVsbZP/H/ewzgsd5fxKXw==
dependencies:
- fbjs "^0.8.16"
loose-envify "^1.1.0"
object-assign "^4.1.1"
- prop-types "^15.6.0"
+ prop-types "^15.6.2"
+ scheduler "^0.13.6"
read-pkg-up@^1.0.1:
version "1.0.1"
- resolved "http://registry.npm.taobao.org/read-pkg-up/download/read-pkg-up-1.0.1.tgz#9d63c13276c065918d57f002a57f40a1b643fb02"
+ resolved "https://registry.yarnpkg.com/read-pkg-up/-/read-pkg-up-1.0.1.tgz#9d63c13276c065918d57f002a57f40a1b643fb02"
+ integrity sha1-nWPBMnbAZZGNV/ACpX9AobZD+wI=
dependencies:
find-up "^1.0.0"
read-pkg "^1.0.0"
read-pkg-up@^2.0.0:
version "2.0.0"
- resolved "http://registry.npm.taobao.org/read-pkg-up/download/read-pkg-up-2.0.0.tgz#6b72a8048984e0c41e79510fd5e9fa99b3b549be"
+ resolved "https://registry.yarnpkg.com/read-pkg-up/-/read-pkg-up-2.0.0.tgz#6b72a8048984e0c41e79510fd5e9fa99b3b549be"
+ integrity sha1-a3KoBImE4MQeeVEP1en6mbO1Sb4=
dependencies:
find-up "^2.0.0"
read-pkg "^2.0.0"
read-pkg-up@^3.0.0:
version "3.0.0"
- resolved "http://registry.npm.taobao.org/read-pkg-up/download/read-pkg-up-3.0.0.tgz#3ed496685dba0f8fe118d0691dc51f4a1ff96f07"
+ resolved "https://registry.yarnpkg.com/read-pkg-up/-/read-pkg-up-3.0.0.tgz#3ed496685dba0f8fe118d0691dc51f4a1ff96f07"
+ integrity sha1-PtSWaF26D4/hGNBpHcUfSh/5bwc=
dependencies:
find-up "^2.0.0"
read-pkg "^3.0.0"
-read-pkg@^1.0.0, read-pkg@^1.1.0:
+read-pkg-up@^4.0.0:
+ version "4.0.0"
+ resolved "https://registry.yarnpkg.com/read-pkg-up/-/read-pkg-up-4.0.0.tgz#1b221c6088ba7799601c808f91161c66e58f8978"
+ integrity sha512-6etQSH7nJGsK0RbG/2TeDzZFa8shjQ1um+SwQQ5cwKy0dhSXdOncEhb1CPpvQG4h7FyOV6EB6YlV0yJvZQNAkA==
+ dependencies:
+ find-up "^3.0.0"
+ read-pkg "^3.0.0"
+
+read-pkg@^1.0.0:
version "1.1.0"
- resolved "http://registry.npm.taobao.org/read-pkg/download/read-pkg-1.1.0.tgz#f5ffaa5ecd29cb31c0474bca7d756b6bb29e3f28"
+ resolved "https://registry.yarnpkg.com/read-pkg/-/read-pkg-1.1.0.tgz#f5ffaa5ecd29cb31c0474bca7d756b6bb29e3f28"
+ integrity sha1-9f+qXs0pyzHAR0vKfXVra7KePyg=
dependencies:
load-json-file "^1.0.0"
normalize-package-data "^2.3.2"
@@ -8205,7 +7703,8 @@ read-pkg@^1.0.0, read-pkg@^1.1.0:
read-pkg@^2.0.0:
version "2.0.0"
- resolved "http://registry.npm.taobao.org/read-pkg/download/read-pkg-2.0.0.tgz#8ef1c0623c6a6db0dc6713c4bfac46332b2368f8"
+ resolved "https://registry.yarnpkg.com/read-pkg/-/read-pkg-2.0.0.tgz#8ef1c0623c6a6db0dc6713c4bfac46332b2368f8"
+ integrity sha1-jvHAYjxqbbDcZxPEv6xGMysjaPg=
dependencies:
load-json-file "^2.0.0"
normalize-package-data "^2.3.2"
@@ -8213,24 +7712,27 @@ read-pkg@^2.0.0:
read-pkg@^3.0.0:
version "3.0.0"
- resolved "http://registry.npm.taobao.org/read-pkg/download/read-pkg-3.0.0.tgz#9cbc686978fee65d16c00e2b19c237fcf6e38389"
+ resolved "https://registry.yarnpkg.com/read-pkg/-/read-pkg-3.0.0.tgz#9cbc686978fee65d16c00e2b19c237fcf6e38389"
+ integrity sha1-nLxoaXj+5l0WwA4rGcI3/Pbjg4k=
dependencies:
load-json-file "^4.0.0"
normalize-package-data "^2.3.2"
path-type "^3.0.0"
-read-pkg@^4.0.1:
- version "4.0.1"
- resolved "https://registry.yarnpkg.com/read-pkg/-/read-pkg-4.0.1.tgz#963625378f3e1c4d48c85872b5a6ec7d5d093237"
- integrity sha1-ljYlN48+HE1IyFhytabsfV0JMjc=
+read-pkg@^5.1.1:
+ version "5.1.1"
+ resolved "https://registry.yarnpkg.com/read-pkg/-/read-pkg-5.1.1.tgz#5cf234dde7a405c90c88a519ab73c467e9cb83f5"
+ integrity sha512-dFcTLQi6BZ+aFUaICg7er+/usEoqFdQxiEBsEMNGoipenihtxxtdrQuBXvyANCEI8VuUIVYFgeHGx9sLLvim4w==
dependencies:
- normalize-package-data "^2.3.2"
+ "@types/normalize-package-data" "^2.4.0"
+ normalize-package-data "^2.5.0"
parse-json "^4.0.0"
- pify "^3.0.0"
+ type-fest "^0.4.1"
-"readable-stream@1 || 2", readable-stream@^2.0.0, readable-stream@^2.0.1, readable-stream@^2.0.2, readable-stream@^2.0.4, readable-stream@^2.0.5, readable-stream@^2.0.6, readable-stream@^2.1.5, readable-stream@^2.2.2, readable-stream@^2.2.9, readable-stream@^2.3.0, readable-stream@^2.3.3, readable-stream@^2.3.5, readable-stream@^2.3.6:
+"readable-stream@1 || 2", readable-stream@^2.0.0, readable-stream@^2.0.1, readable-stream@^2.0.2, readable-stream@^2.0.5, readable-stream@^2.0.6, readable-stream@^2.1.5, readable-stream@^2.2.2, readable-stream@^2.3.0, readable-stream@^2.3.3, readable-stream@^2.3.5, readable-stream@^2.3.6, readable-stream@~2.3.6:
version "2.3.6"
- resolved "http://registry.npm.taobao.org/readable-stream/download/readable-stream-2.3.6.tgz#b11c27d88b8ff1fbe070643cf94b0c79ae1b0aaf"
+ resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.6.tgz#b11c27d88b8ff1fbe070643cf94b0c79ae1b0aaf"
+ integrity sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==
dependencies:
core-util-is "~1.0.0"
inherits "~2.0.3"
@@ -8240,392 +7742,341 @@ read-pkg@^4.0.1:
string_decoder "~1.1.1"
util-deprecate "~1.0.1"
[email protected]:
- version "1.0.34"
- resolved "http://registry.npm.taobao.org/readable-stream/download/readable-stream-1.0.34.tgz#125820e34bc842d2f2aaafafe4c2916ee32c157c"
+"readable-stream@2 || 3", readable-stream@^3.0.2, readable-stream@^3.0.6, readable-stream@^3.1.1:
+ version "3.4.0"
+ resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-3.4.0.tgz#a51c26754658e0a3c21dbf59163bd45ba6f447fc"
+ integrity sha512-jItXPLmrSR8jmTRmRWJXCnGJsfy85mB3Wd/uINMXA65yrnFo0cPClFIUWzo2najVNSl+mx7/4W8ttlLWJe99pQ==
dependencies:
- core-util-is "~1.0.0"
- inherits "~2.0.1"
- isarray "0.0.1"
- string_decoder "~0.10.x"
+ inherits "^2.0.3"
+ string_decoder "^1.1.1"
+ util-deprecate "^1.0.1"
-readdirp@^2.0.0:
- version "2.1.0"
- resolved "http://registry.npm.taobao.org/readdirp/download/readdirp-2.1.0.tgz#4ed0ad060df3073300c48440373f72d1cc642d78"
+readdirp@^2.2.1:
+ version "2.2.1"
+ resolved "https://registry.yarnpkg.com/readdirp/-/readdirp-2.2.1.tgz#0e87622a3325aa33e892285caf8b4e846529a525"
+ integrity sha512-1JU/8q+VgFZyxwrJ+SVIOsh+KywWGpds3NTqikiKpDMZWScmAYyKIgqkO+ARvNWJfXeXR1zxz7aHF4u4CyH6vQ==
dependencies:
- graceful-fs "^4.1.2"
- minimatch "^3.0.2"
+ graceful-fs "^4.1.11"
+ micromatch "^3.1.10"
readable-stream "^2.0.2"
- set-immediate-shim "^1.0.1"
-realpath-native@^1.0.0:
- version "1.0.0"
- resolved "http://registry.npm.taobao.org/realpath-native/download/realpath-native-1.0.0.tgz#7885721a83b43bd5327609f0ddecb2482305fdf0"
+realpath-native@^1.1.0:
+ version "1.1.0"
+ resolved "https://registry.yarnpkg.com/realpath-native/-/realpath-native-1.1.0.tgz#2003294fea23fb0672f2476ebe22fcf498a2d65c"
+ integrity sha512-wlgPA6cCIIg9gKz0fgAPjnzh4yR/LnXovwuo9hvyGvx3h8nX4+/iLZplfUWasXpqD8BdnGnP5njOFjkUwPzvjA==
dependencies:
util.promisify "^1.0.0"
+recast@~0.11.12:
+ version "0.11.23"
+ resolved "https://registry.yarnpkg.com/recast/-/recast-0.11.23.tgz#451fd3004ab1e4df9b4e4b66376b2a21912462d3"
+ integrity sha1-RR/TAEqx5N+bTktmN2sqIZEkYtM=
+ dependencies:
+ ast-types "0.9.6"
+ esprima "~3.1.0"
+ private "~0.1.5"
+ source-map "~0.5.0"
+
rechoir@^0.6.2:
version "0.6.2"
- resolved "http://registry.npm.taobao.org/rechoir/download/rechoir-0.6.2.tgz#85204b54dba82d5742e28c96756ef43af50e3384"
+ resolved "https://registry.yarnpkg.com/rechoir/-/rechoir-0.6.2.tgz#85204b54dba82d5742e28c96756ef43af50e3384"
+ integrity sha1-hSBLVNuoLVdC4oyWdW70OvUOM4Q=
dependencies:
resolve "^1.1.6"
[email protected]:
- version "2.2.1"
- resolved "http://registry.npm.taobao.org/recursive-readdir/download/recursive-readdir-2.2.1.tgz#90ef231d0778c5ce093c9a48d74e5c5422d13a99"
- dependencies:
- minimatch "3.0.3"
-
redent@^1.0.0:
version "1.0.0"
- resolved "http://registry.npm.taobao.org/redent/download/redent-1.0.0.tgz#cf916ab1fd5f1f16dfb20822dd6ec7f730c2afde"
+ resolved "https://registry.yarnpkg.com/redent/-/redent-1.0.0.tgz#cf916ab1fd5f1f16dfb20822dd6ec7f730c2afde"
+ integrity sha1-z5Fqsf1fHxbfsggi3W7H9zDCr94=
dependencies:
indent-string "^2.1.0"
strip-indent "^1.0.1"
redent@^2.0.0:
version "2.0.0"
- resolved "http://registry.npm.taobao.org/redent/download/redent-2.0.0.tgz#c1b2007b42d57eb1389079b3c8333639d5e1ccaa"
+ resolved "https://registry.yarnpkg.com/redent/-/redent-2.0.0.tgz#c1b2007b42d57eb1389079b3c8333639d5e1ccaa"
+ integrity sha1-wbIAe0LVfrE4kHmzyDM2OdXhzKo=
dependencies:
indent-string "^3.0.0"
strip-indent "^2.0.0"
-reduce-css-calc@^1.2.6:
- version "1.3.0"
- resolved "http://registry.npm.taobao.org/reduce-css-calc/download/reduce-css-calc-1.3.0.tgz#747c914e049614a4c9cfbba629871ad1d2927716"
- dependencies:
- balanced-match "^0.4.2"
- math-expression-evaluator "^1.2.14"
- reduce-function-call "^1.0.1"
-
-reduce-function-call@^1.0.1:
- version "1.0.2"
- resolved "http://registry.npm.taobao.org/reduce-function-call/download/reduce-function-call-1.0.2.tgz#5a200bf92e0e37751752fe45b0ab330fd4b6be99"
- dependencies:
- balanced-match "^0.4.2"
-
-redux-thunk@^2.2.0:
- version "2.2.0"
- resolved "http://registry.npm.taobao.org/redux-thunk/download/redux-thunk-2.2.0.tgz#e615a16e16b47a19a515766133d1e3e99b7852e5"
-
-redux@^3.6.0, redux@^3.7.2:
- version "3.7.2"
- resolved "http://registry.npm.taobao.org/redux/download/redux-3.7.2.tgz#06b73123215901d25d065be342eb026bc1c8537b"
+regenerate-unicode-properties@^8.0.2:
+ version "8.1.0"
+ resolved "https://registry.yarnpkg.com/regenerate-unicode-properties/-/regenerate-unicode-properties-8.1.0.tgz#ef51e0f0ea4ad424b77bf7cb41f3e015c70a3f0e"
+ integrity sha512-LGZzkgtLY79GeXLm8Dp0BVLdQlWICzBnJz/ipWUgo59qBaZ+BHtq51P2q1uVZlppMuUAT37SDk39qUbjTWB7bA==
dependencies:
- lodash "^4.2.1"
- lodash-es "^4.2.1"
- loose-envify "^1.1.0"
- symbol-observable "^1.0.3"
+ regenerate "^1.4.0"
-regenerate@^1.2.1:
+regenerate@^1.4.0:
version "1.4.0"
- resolved "http://registry.npm.taobao.org/regenerate/download/regenerate-1.4.0.tgz#4a856ec4b56e4077c557589cae85e7a4c8869a11"
+ resolved "https://registry.yarnpkg.com/regenerate/-/regenerate-1.4.0.tgz#4a856ec4b56e4077c557589cae85e7a4c8869a11"
+ integrity sha512-1G6jJVDWrt0rK99kBjvEtziZNCICAuvIPkSiUFIQxVP06RCVpq3dmDo2oi6ABpYaDYaTRr67BEhL8r1wgEZZKg==
-regenerator-runtime@^0.10.0, regenerator-runtime@^0.10.5:
+regenerator-runtime@^0.10.5:
version "0.10.5"
- resolved "http://registry.npm.taobao.org/regenerator-runtime/download/regenerator-runtime-0.10.5.tgz#336c3efc1220adcedda2c9fab67b5a7955a33658"
+ resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.10.5.tgz#336c3efc1220adcedda2c9fab67b5a7955a33658"
+ integrity sha1-M2w+/BIgrc7dosn6tntaeVWjNlg=
regenerator-runtime@^0.11.0:
version "0.11.1"
- resolved "http://registry.npm.taobao.org/regenerator-runtime/download/regenerator-runtime-0.11.1.tgz#be05ad7f9bf7d22e056f9726cee5017fbf19e2e9"
+ resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.11.1.tgz#be05ad7f9bf7d22e056f9726cee5017fbf19e2e9"
+ integrity sha512-MguG95oij0fC3QV3URf4V2SDYGJhJnJGqvIIgdECeODCT98wSWDAJ94SSuVpYQUoTcGUIL6L4yNB7j1DFFHSBg==
-regenerator-runtime@^0.12.0:
- version "0.12.1"
- resolved "http://registry.npm.taobao.org/regenerator-runtime/download/regenerator-runtime-0.12.1.tgz#fa1a71544764c036f8c49b13a08b2594c9f8a0de"
- integrity sha1-+hpxVEdkwDb4xJsToIsllMn4oN4=
-
-regenerator-transform@^0.10.0:
- version "0.10.1"
- resolved "http://registry.npm.taobao.org/regenerator-transform/download/regenerator-transform-0.10.1.tgz#1e4996837231da8b7f3cf4114d71b5691a0680dd"
+regenerator-transform@^0.14.0:
+ version "0.14.0"
+ resolved "https://registry.yarnpkg.com/regenerator-transform/-/regenerator-transform-0.14.0.tgz#2ca9aaf7a2c239dd32e4761218425b8c7a86ecaf"
+ integrity sha512-rtOelq4Cawlbmq9xuMR5gdFmv7ku/sFoB7sRiywx7aq53bc52b4j6zvH7Te1Vt/X2YveDKnCGUbioieU7FEL3w==
dependencies:
- babel-runtime "^6.18.0"
- babel-types "^6.19.0"
private "^0.1.6"
-regex-cache@^0.4.2:
- version "0.4.4"
- resolved "http://registry.npm.taobao.org/regex-cache/download/regex-cache-0.4.4.tgz#75bdc58a2a1496cec48a12835bc54c8d562336dd"
- dependencies:
- is-equal-shallow "^0.1.3"
-
regex-not@^1.0.0, regex-not@^1.0.2:
version "1.0.2"
- resolved "http://registry.npm.taobao.org/regex-not/download/regex-not-1.0.2.tgz#1f4ece27e00b0b65e0247a6810e6a85d83a5752c"
+ resolved "https://registry.yarnpkg.com/regex-not/-/regex-not-1.0.2.tgz#1f4ece27e00b0b65e0247a6810e6a85d83a5752c"
+ integrity sha512-J6SDjUgDxQj5NusnOtdFxDwN/+HWykR8GELwctJ7mdqhcyy1xEc4SRFHUXvxTp661YaVKAjfRLZ9cCqS6tn32A==
dependencies:
extend-shallow "^3.0.2"
safe-regex "^1.1.0"
-regexpu-core@^1.0.0:
- version "1.0.0"
- resolved "http://registry.npm.taobao.org/regexpu-core/download/regexpu-core-1.0.0.tgz#86a763f58ee4d7c2f6b102e4764050de7ed90c6b"
- dependencies:
- regenerate "^1.2.1"
- regjsgen "^0.2.0"
- regjsparser "^0.1.4"
-
-regexpu-core@^2.0.0:
- version "2.0.0"
- resolved "http://registry.npm.taobao.org/regexpu-core/download/regexpu-core-2.0.0.tgz#49d038837b8dcf8bfa5b9a42139938e6ea2ae240"
- dependencies:
- regenerate "^1.2.1"
- regjsgen "^0.2.0"
- regjsparser "^0.1.4"
+regexp-tree@^0.1.6:
+ version "0.1.10"
+ resolved "https://registry.yarnpkg.com/regexp-tree/-/regexp-tree-0.1.10.tgz#d837816a039c7af8a8d64d7a7c3cf6a1d93450bc"
+ integrity sha512-K1qVSbcedffwuIslMwpe6vGlj+ZXRnGkvjAtFHfDZZZuEdA/h0dxljAPu9vhUo6Rrx2U2AwJ+nSQ6hK+lrP5MQ==
-regjsgen@^0.2.0:
- version "0.2.0"
- resolved "http://registry.npm.taobao.org/regjsgen/download/regjsgen-0.2.0.tgz#6c016adeac554f75823fe37ac05b92d5a4edb1f7"
+regexpp@^2.0.1:
+ version "2.0.1"
+ resolved "https://registry.yarnpkg.com/regexpp/-/regexpp-2.0.1.tgz#8d19d31cf632482b589049f8281f93dbcba4d07f"
+ integrity sha512-lv0M6+TkDVniA3aD1Eg0DVpfU/booSu7Eev3TDO/mZKHBfVjgCGTV4t4buppESEYDtkArYFOxTJWv6S5C+iaNw==
+
+regexpu-core@^4.5.4:
+ version "4.5.4"
+ resolved "https://registry.yarnpkg.com/regexpu-core/-/regexpu-core-4.5.4.tgz#080d9d02289aa87fe1667a4f5136bc98a6aebaae"
+ integrity sha512-BtizvGtFQKGPUcTy56o3nk1bGRp4SZOTYrDtGNlqCQufptV5IkkLN6Emw+yunAJjzf+C9FQFtvq7IoA3+oMYHQ==
+ dependencies:
+ regenerate "^1.4.0"
+ regenerate-unicode-properties "^8.0.2"
+ regjsgen "^0.5.0"
+ regjsparser "^0.6.0"
+ unicode-match-property-ecmascript "^1.0.4"
+ unicode-match-property-value-ecmascript "^1.1.0"
+
+regjsgen@^0.5.0:
+ version "0.5.0"
+ resolved "https://registry.yarnpkg.com/regjsgen/-/regjsgen-0.5.0.tgz#a7634dc08f89209c2049adda3525711fb97265dd"
+ integrity sha512-RnIrLhrXCX5ow/E5/Mh2O4e/oa1/jW0eaBKTSy3LaCj+M3Bqvm97GWDp2yUtzIs4LEn65zR2yiYGFqb2ApnzDA==
-regjsparser@^0.1.4:
- version "0.1.5"
- resolved "http://registry.npm.taobao.org/regjsparser/download/regjsparser-0.1.5.tgz#7ee8f84dc6fa792d3fd0ae228d24bd949ead205c"
+regjsparser@^0.6.0:
+ version "0.6.0"
+ resolved "https://registry.yarnpkg.com/regjsparser/-/regjsparser-0.6.0.tgz#f1e6ae8b7da2bae96c99399b868cd6c933a2ba9c"
+ integrity sha512-RQ7YyokLiQBomUJuUG8iGVvkgOLxwyZM8k6d3q5SAXpg4r5TZJZigKFvC6PpD+qQ98bCDC5YelPeA3EucDoNeQ==
dependencies:
jsesc "~0.5.0"
[email protected]:
version "0.2.7"
- resolved "http://registry.npm.taobao.org/relateurl/download/relateurl-0.2.7.tgz#54dbf377e51440aca90a4cd274600d3ff2d888a9"
+ resolved "https://registry.yarnpkg.com/relateurl/-/relateurl-0.2.7.tgz#54dbf377e51440aca90a4cd274600d3ff2d888a9"
+ integrity sha1-VNvzd+UUQKypCkzSdGANP/LYiKk=
remove-trailing-separator@^1.0.1:
version "1.1.0"
- resolved "http://registry.npm.taobao.org/remove-trailing-separator/download/remove-trailing-separator-1.1.0.tgz#c24bce2a283adad5bc3f58e0d48249b92379d8ef"
+ resolved "https://registry.yarnpkg.com/remove-trailing-separator/-/remove-trailing-separator-1.1.0.tgz#c24bce2a283adad5bc3f58e0d48249b92379d8ef"
+ integrity sha1-wkvOKig62tW8P1jg1IJJuSN52O8=
renderkid@^2.0.1:
- version "2.0.1"
- resolved "http://registry.npm.taobao.org/renderkid/download/renderkid-2.0.1.tgz#898cabfc8bede4b7b91135a3ffd323e58c0db319"
+ version "2.0.3"
+ resolved "https://registry.yarnpkg.com/renderkid/-/renderkid-2.0.3.tgz#380179c2ff5ae1365c522bf2fcfcff01c5b74149"
+ integrity sha512-z8CLQp7EZBPCwCnncgf9C4XAi3WR0dv+uWu/PjIyhhAb5d6IJ/QZqlHFprHeKT+59//V6BNUsLbvN8+2LarxGA==
dependencies:
css-select "^1.1.0"
- dom-converter "~0.1"
- htmlparser2 "~3.3.0"
+ dom-converter "^0.2"
+ htmlparser2 "^3.3.0"
strip-ansi "^3.0.0"
- utila "~0.3"
+ utila "^0.4.0"
repeat-element@^1.1.2:
- version "1.1.2"
- resolved "http://registry.npm.taobao.org/repeat-element/download/repeat-element-1.1.2.tgz#ef089a178d1483baae4d93eb98b4f9e4e11d990a"
+ version "1.1.3"
+ resolved "https://registry.yarnpkg.com/repeat-element/-/repeat-element-1.1.3.tgz#782e0d825c0c5a3bb39731f84efee6b742e6b1ce"
+ integrity sha512-ahGq0ZnV5m5XtZLMb+vP76kcAM5nkLqk0lpqAuojSKGgQtn4eRi4ZZGm2olo2zKFH+sMsWaqOCW1dqAnOru72g==
-repeat-string@^1.5.2, repeat-string@^1.6.1:
+repeat-string@^1.6.1:
version "1.6.1"
- resolved "http://registry.npm.taobao.org/repeat-string/download/repeat-string-1.6.1.tgz#8dcae470e1c88abc2d600fff4a776286da75e637"
+ resolved "https://registry.yarnpkg.com/repeat-string/-/repeat-string-1.6.1.tgz#8dcae470e1c88abc2d600fff4a776286da75e637"
+ integrity sha1-jcrkcOHIirwtYA//Sndihtp15jc=
repeating@^2.0.0:
version "2.0.1"
- resolved "http://registry.npm.taobao.org/repeating/download/repeating-2.0.1.tgz#5214c53a926d3552707527fbab415dbc08d06dda"
+ resolved "https://registry.yarnpkg.com/repeating/-/repeating-2.0.1.tgz#5214c53a926d3552707527fbab415dbc08d06dda"
+ integrity sha1-UhTFOpJtNVJwdSf7q0FdvAjQbdo=
dependencies:
is-finite "^1.0.0"
[email protected]:
- version "1.1.1"
- resolved "http://registry.npm.taobao.org/request-promise-core/download/request-promise-core-1.1.1.tgz#3eee00b2c5aa83239cfb04c5700da36f81cd08b6"
[email protected]:
+ version "1.1.2"
+ resolved "https://registry.yarnpkg.com/request-promise-core/-/request-promise-core-1.1.2.tgz#339f6aababcafdb31c799ff158700336301d3346"
+ integrity sha512-UHYyq1MO8GsefGEt7EprS8UrXsm1TxEvFUX1IMTuSLU2Rh7fTIdFtl8xD7JiEYiWU2dl+NYAjCTksTehQUxPag==
dependencies:
- lodash "^4.13.1"
+ lodash "^4.17.11"
request-promise-native@^1.0.5:
- version "1.0.5"
- resolved "http://registry.npm.taobao.org/request-promise-native/download/request-promise-native-1.0.5.tgz#5281770f68e0c9719e5163fd3fab482215f4fda5"
+ version "1.0.7"
+ resolved "https://registry.yarnpkg.com/request-promise-native/-/request-promise-native-1.0.7.tgz#a49868a624bdea5069f1251d0a836e0d89aa2c59"
+ integrity sha512-rIMnbBdgNViL37nZ1b3L/VfPOpSi0TqVDQPAvO6U14lMzOLrt5nilxCQqtDKhZeDiW0/hkCXGoQjhgJd/tCh6w==
dependencies:
- request-promise-core "1.1.1"
- stealthy-require "^1.1.0"
- tough-cookie ">=2.3.3"
+ request-promise-core "1.1.2"
+ stealthy-require "^1.1.1"
+ tough-cookie "^2.3.3"
-request@2, request@^2.83.0:
- version "2.87.0"
- resolved "http://registry.npm.taobao.org/request/download/request-2.87.0.tgz#32f00235cd08d482b4d0d68db93a829c0ed5756e"
+request@^2.87.0:
+ version "2.88.0"
+ resolved "https://registry.yarnpkg.com/request/-/request-2.88.0.tgz#9c2fca4f7d35b592efe57c7f0a55e81052124fef"
+ integrity sha512-NAqBSrijGLZdM0WZNsInLJpkJokL72XYjUpnB0iwsRgxh7dB6COrHnTBNwN0E+lHDAJzu7kLAkDeY08z2/A0hg==
dependencies:
aws-sign2 "~0.7.0"
- aws4 "^1.6.0"
+ aws4 "^1.8.0"
caseless "~0.12.0"
- combined-stream "~1.0.5"
- extend "~3.0.1"
+ combined-stream "~1.0.6"
+ extend "~3.0.2"
forever-agent "~0.6.1"
- form-data "~2.3.1"
- har-validator "~5.0.3"
+ form-data "~2.3.2"
+ har-validator "~5.1.0"
http-signature "~1.2.0"
is-typedarray "~1.0.0"
isstream "~0.1.2"
json-stringify-safe "~5.0.1"
- mime-types "~2.1.17"
- oauth-sign "~0.8.2"
+ mime-types "~2.1.19"
+ oauth-sign "~0.9.0"
performance-now "^2.1.0"
- qs "~6.5.1"
- safe-buffer "^5.1.1"
- tough-cookie "~2.3.3"
+ qs "~6.5.2"
+ safe-buffer "^5.1.2"
+ tough-cookie "~2.4.3"
tunnel-agent "^0.6.0"
- uuid "^3.1.0"
-
-request@~2.79.0:
- version "2.79.0"
- resolved "http://registry.npm.taobao.org/request/download/request-2.79.0.tgz#4dfe5bf6be8b8cdc37fcf93e04b65577722710de"
- dependencies:
- aws-sign2 "~0.6.0"
- aws4 "^1.2.1"
- caseless "~0.11.0"
- combined-stream "~1.0.5"
- extend "~3.0.0"
- forever-agent "~0.6.1"
- form-data "~2.1.1"
- har-validator "~2.0.6"
- hawk "~3.1.3"
- http-signature "~1.1.0"
- is-typedarray "~1.0.0"
- isstream "~0.1.2"
- json-stringify-safe "~5.0.1"
- mime-types "~2.1.7"
- oauth-sign "~0.8.1"
- qs "~6.3.0"
- stringstream "~0.0.4"
- tough-cookie "~2.3.0"
- tunnel-agent "~0.4.1"
- uuid "^3.0.0"
+ uuid "^3.3.2"
require-directory@^2.1.1:
version "2.1.1"
- resolved "http://registry.npm.taobao.org/require-directory/download/require-directory-2.1.1.tgz#8c64ad5fd30dab1c976e2344ffe7f792a6a6df42"
-
-require-from-string@^1.1.0:
- version "1.2.1"
- resolved "http://registry.npm.taobao.org/require-from-string/download/require-from-string-1.2.1.tgz#529c9ccef27380adfec9a2f965b649bbee636418"
-
-require-from-string@^2.0.1:
- version "2.0.2"
- resolved "http://registry.npm.taobao.org/require-from-string/download/require-from-string-2.0.2.tgz#89a7fdd938261267318eafe14f9c32e598c36909"
+ resolved "https://registry.yarnpkg.com/require-directory/-/require-directory-2.1.1.tgz#8c64ad5fd30dab1c976e2344ffe7f792a6a6df42"
+ integrity sha1-jGStX9MNqxyXbiNE/+f3kqam30I=
require-main-filename@^1.0.1:
version "1.0.1"
- resolved "http://registry.npm.taobao.org/require-main-filename/download/require-main-filename-1.0.1.tgz#97f717b69d48784f5f526a6c5aa8ffdda055a4d1"
+ resolved "https://registry.yarnpkg.com/require-main-filename/-/require-main-filename-1.0.1.tgz#97f717b69d48784f5f526a6c5aa8ffdda055a4d1"
+ integrity sha1-l/cXtp1IeE9fUmpsWqj/3aBVpNE=
-require-package-name@^2.0.1:
- version "2.0.1"
- resolved "http://registry.npm.taobao.org/require-package-name/download/require-package-name-2.0.1.tgz#c11e97276b65b8e2923f75dabf5fb2ef0c3841b9"
-
-require-uncached@^1.0.3:
- version "1.0.3"
- resolved "http://registry.npm.taobao.org/require-uncached/download/require-uncached-1.0.3.tgz#4e0d56d6c9662fd31e43011c4b95aa49955421d3"
- dependencies:
- caller-path "^0.1.0"
- resolve-from "^1.0.0"
+require-main-filename@^2.0.0:
+ version "2.0.0"
+ resolved "https://registry.yarnpkg.com/require-main-filename/-/require-main-filename-2.0.0.tgz#d0b329ecc7cc0f61649f62215be69af54aa8989b"
+ integrity sha512-NKN5kMDylKuldxYLSUfrbo5Tuzh4hd+2E8NPPX02mZtn1VuREQToYe/ZdlJy+J3uCpfaiGF05e7B8W0iXbQHmg==
requires-port@^1.0.0:
version "1.0.0"
- resolved "http://registry.npm.taobao.org/requires-port/download/requires-port-1.0.0.tgz#925d2601d39ac485e091cf0da5c6e694dc3dcaff"
-
-resize-observer-polyfill@^1.5.0:
- version "1.5.0"
- resolved "http://registry.npm.taobao.org/resize-observer-polyfill/download/resize-observer-polyfill-1.5.0.tgz#660ff1d9712a2382baa2cad450a4716209f9ca69"
+ resolved "https://registry.yarnpkg.com/requires-port/-/requires-port-1.0.0.tgz#925d2601d39ac485e091cf0da5c6e694dc3dcaff"
+ integrity sha1-kl0mAdOaxIXgkc8NpcbmlNw9yv8=
resolve-cwd@^2.0.0:
version "2.0.0"
- resolved "http://registry.npm.taobao.org/resolve-cwd/download/resolve-cwd-2.0.0.tgz#00a9f7387556e27038eae232caa372a6a59b665a"
+ resolved "https://registry.yarnpkg.com/resolve-cwd/-/resolve-cwd-2.0.0.tgz#00a9f7387556e27038eae232caa372a6a59b665a"
+ integrity sha1-AKn3OHVW4nA46uIyyqNypqWbZlo=
dependencies:
resolve-from "^3.0.0"
-resolve-dir@^0.1.0:
- version "0.1.1"
- resolved "http://registry.npm.taobao.org/resolve-dir/download/resolve-dir-0.1.1.tgz#b219259a5602fac5c5c496ad894a6e8cc430261e"
- dependencies:
- expand-tilde "^1.2.2"
- global-modules "^0.2.3"
-
-resolve-dir@^1.0.0:
+resolve-dir@^1.0.0, resolve-dir@^1.0.1:
version "1.0.1"
- resolved "http://registry.npm.taobao.org/resolve-dir/download/resolve-dir-1.0.1.tgz#79a40644c362be82f26effe739c9bb5382046f43"
+ resolved "https://registry.yarnpkg.com/resolve-dir/-/resolve-dir-1.0.1.tgz#79a40644c362be82f26effe739c9bb5382046f43"
+ integrity sha1-eaQGRMNivoLybv/nOcm7U4IEb0M=
dependencies:
expand-tilde "^2.0.0"
global-modules "^1.0.0"
[email protected], resolve-from@^4.0.0:
- version "4.0.0"
- resolved "http://registry.npm.taobao.org/resolve-from/download/resolve-from-4.0.0.tgz#4abcd852ad32dd7baabfe9b40e00a36db5f392e6"
-
-resolve-from@^1.0.0:
- version "1.0.1"
- resolved "http://registry.npm.taobao.org/resolve-from/download/resolve-from-1.0.1.tgz#26cbfe935d1aeeeabb29bc3fe5aeb01e93d44226"
[email protected], resolve-from@^5.0.0:
+ version "5.0.0"
+ resolved "https://registry.yarnpkg.com/resolve-from/-/resolve-from-5.0.0.tgz#c35225843df8f776df21c57557bc087e9dfdfc69"
+ integrity sha512-qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw==
resolve-from@^3.0.0:
version "3.0.0"
- resolved "http://registry.npm.taobao.org/resolve-from/download/resolve-from-3.0.0.tgz#b22c7af7d9d6881bc8b6e653335eebcb0a188748"
+ resolved "https://registry.yarnpkg.com/resolve-from/-/resolve-from-3.0.0.tgz#b22c7af7d9d6881bc8b6e653335eebcb0a188748"
+ integrity sha1-six699nWiBvItuZTM17rywoYh0g=
-resolve-global@^0.1.0:
- version "0.1.0"
- resolved "http://registry.npm.taobao.org/resolve-global/download/resolve-global-0.1.0.tgz#8fb02cfd5b7db20118e886311f15af95bd15fbd9"
+resolve-from@^4.0.0:
+ version "4.0.0"
+ resolved "https://registry.yarnpkg.com/resolve-from/-/resolve-from-4.0.0.tgz#4abcd852ad32dd7baabfe9b40e00a36db5f392e6"
+ integrity sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==
+
[email protected], resolve-global@^1.0.0:
+ version "1.0.0"
+ resolved "https://registry.yarnpkg.com/resolve-global/-/resolve-global-1.0.0.tgz#a2a79df4af2ca3f49bf77ef9ddacd322dad19255"
+ integrity sha512-zFa12V4OLtT5XUX/Q4VLvTfBf+Ok0SPc1FNGM/z9ctUdiU618qwKpWnd0CHs3+RqROfyEg/DhuHbMWYqcgljEw==
dependencies:
- global-dirs "^0.1.0"
+ global-dirs "^0.1.1"
resolve-url@^0.2.1:
version "0.2.1"
- resolved "http://registry.npm.taobao.org/resolve-url/download/resolve-url-0.2.1.tgz#2c637fe77c893afd2a663fe21aa9080068e2052a"
+ resolved "https://registry.yarnpkg.com/resolve-url/-/resolve-url-0.2.1.tgz#2c637fe77c893afd2a663fe21aa9080068e2052a"
+ integrity sha1-LGN/53yJOv0qZj/iGqkIAGjiBSo=
[email protected]:
version "1.1.7"
- resolved "http://registry.npm.taobao.org/resolve/download/resolve-1.1.7.tgz#203114d82ad2c5ed9e8e0411b3932875e889e97b"
-
-resolve@^1.1.6, resolve@^1.1.7, resolve@^1.3.2, resolve@^1.4.0, resolve@^1.5.0:
- version "1.7.1"
- resolved "http://registry.npm.taobao.org/resolve/download/resolve-1.7.1.tgz#aadd656374fd298aee895bc026b8297418677fd3"
- dependencies:
- path-parse "^1.0.5"
+ resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.1.7.tgz#203114d82ad2c5ed9e8e0411b3932875e889e97b"
+ integrity sha1-IDEU2CrSxe2ejgQRs5ModeiJ6Xs=
-restore-cursor@^1.0.1:
- version "1.0.1"
- resolved "http://registry.npm.taobao.org/restore-cursor/download/restore-cursor-1.0.1.tgz#34661f46886327fed2991479152252df92daa541"
+resolve@^1.1.6, resolve@^1.10.0, resolve@^1.10.1, resolve@^1.11.0, resolve@^1.3.2, resolve@^1.5.0:
+ version "1.11.1"
+ resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.11.1.tgz#ea10d8110376982fef578df8fc30b9ac30a07a3e"
+ integrity sha512-vIpgF6wfuJOZI7KKKSP+HmiKggadPQAdsp5HiC1mvqnfp0gF1vdwgBWZIdrVft9pgqoMFQN+R7BSWZiBxx+BBw==
dependencies:
- exit-hook "^1.0.0"
- onetime "^1.0.0"
+ path-parse "^1.0.6"
restore-cursor@^2.0.0:
version "2.0.0"
- resolved "http://registry.npm.taobao.org/restore-cursor/download/restore-cursor-2.0.0.tgz#9f7ee287f82fd326d4fd162923d62129eee0dfaf"
+ resolved "https://registry.yarnpkg.com/restore-cursor/-/restore-cursor-2.0.0.tgz#9f7ee287f82fd326d4fd162923d62129eee0dfaf"
+ integrity sha1-n37ih/gv0ybU/RYpI9YhKe7g368=
dependencies:
onetime "^2.0.0"
signal-exit "^3.0.2"
ret@~0.1.10:
version "0.1.15"
- resolved "http://registry.npm.taobao.org/ret/download/ret-0.1.15.tgz#b8a4825d5bdb1fc3f6f53c2bc33f81388681c7bc"
+ resolved "https://registry.yarnpkg.com/ret/-/ret-0.1.15.tgz#b8a4825d5bdb1fc3f6f53c2bc33f81388681c7bc"
+ integrity sha512-TTlYpa+OL+vMMNG24xSlQGEJ3B/RzEfUlLct7b5G/ytav+wPrplCpVMFuwzXbkecJrb6IYo1iFb0S9v37754mg==
-right-align@^0.1.1:
- version "0.1.3"
- resolved "http://registry.npm.taobao.org/right-align/download/right-align-0.1.3.tgz#61339b722fe6a3515689210d24e14c96148613ef"
- dependencies:
- align-text "^0.1.1"
+retry@^0.12.0:
+ version "0.12.0"
+ resolved "https://registry.yarnpkg.com/retry/-/retry-0.12.0.tgz#1b42a6266a21f07421d1b0b54b7dc167b01c013b"
+ integrity sha1-G0KmJmoh8HQh0bC1S33BZ7AcATs=
+
+reusify@^1.0.0:
+ version "1.0.4"
+ resolved "https://registry.yarnpkg.com/reusify/-/reusify-1.0.4.tgz#90da382b1e126efc02146e90845a88db12925d76"
+ integrity sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw==
right-pad@^1.0.1:
version "1.0.1"
- resolved "http://registry.npm.taobao.org/right-pad/download/right-pad-1.0.1.tgz#8ca08c2cbb5b55e74dafa96bf7fd1a27d568c8d0"
+ resolved "https://registry.yarnpkg.com/right-pad/-/right-pad-1.0.1.tgz#8ca08c2cbb5b55e74dafa96bf7fd1a27d568c8d0"
+ integrity sha1-jKCMLLtbVedNr6lr9/0aJ9VoyNA=
-rimraf@2, rimraf@^2.2.8, rimraf@^2.5.2, rimraf@^2.5.4, rimraf@^2.6.1, rimraf@^2.6.2:
- version "2.6.2"
- resolved "http://registry.npm.taobao.org/rimraf/download/rimraf-2.6.2.tgz#2ed8150d24a16ea8651e6d6ef0f47c4158ce7a36"
[email protected], rimraf@^2.5.2, rimraf@^2.5.4, rimraf@^2.6.1, rimraf@^2.6.2, rimraf@^2.6.3:
+ version "2.6.3"
+ resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.6.3.tgz#b2d104fe0d8fb27cf9e0a1cda8262dd3833c6cab"
+ integrity sha512-mwqeW5XsA2qAejG46gYdENaxXjx9onRNCfn7L0duuP4hCuTIi/QO7PDK07KJfp1d+izWPrzEJDcSqBa0OZQriA==
dependencies:
- glob "^7.0.5"
+ glob "^7.1.3"
ripemd160@^2.0.0, ripemd160@^2.0.1:
version "2.0.2"
- resolved "http://registry.npm.taobao.org/ripemd160/download/ripemd160-2.0.2.tgz#a1c1a6f624751577ba5d07914cbc92850585890c"
+ resolved "https://registry.yarnpkg.com/ripemd160/-/ripemd160-2.0.2.tgz#a1c1a6f624751577ba5d07914cbc92850585890c"
+ integrity sha512-ii4iagi25WusVoiC4B4lq7pbXfAp3D9v5CwfkY33vffw2+pkDjY1D8GaN7spsxvCSx8dkPqOZCEZyfxcmJG2IA==
dependencies:
hash-base "^3.0.0"
inherits "^2.0.1"
-rmc-feedback@^2.0.0:
- version "2.0.0"
- resolved "http://registry.npm.taobao.org/rmc-feedback/download/rmc-feedback-2.0.0.tgz#cbc6cb3ae63c7a635eef0e25e4fbaf5ac366eeaa"
- dependencies:
- babel-runtime "6.x"
- classnames "^2.2.5"
-
-rst-selector-parser@^2.2.3:
- version "2.2.3"
- resolved "http://registry.npm.taobao.org/rst-selector-parser/download/rst-selector-parser-2.2.3.tgz#81b230ea2fcc6066c89e3472de794285d9b03d91"
- dependencies:
- lodash.flattendeep "^4.4.0"
- nearley "^2.7.10"
-
-rsvp@^3.3.3:
- version "3.6.2"
- resolved "http://registry.npm.taobao.org/rsvp/download/rsvp-3.6.2.tgz#2e96491599a96cde1b515d5674a8f7a91452926a"
+rsvp@^4.8.4:
+ version "4.8.5"
+ resolved "https://registry.yarnpkg.com/rsvp/-/rsvp-4.8.5.tgz#c8f155311d167f68f21e168df71ec5b083113734"
+ integrity sha512-nfMOlASu9OnRJo1mbEk2cz0D56a1MBNrJ7orjRZQG10XDyuvwksKbuXNp6qa+kbn839HwjwhBzhFmdsaEAfauA==
run-async@^2.2.0:
version "2.3.0"
- resolved "http://registry.npm.taobao.org/run-async/download/run-async-2.3.0.tgz#0371ab4ae0bdd720d4166d7dfda64ff7a445a6c0"
+ resolved "https://registry.yarnpkg.com/run-async/-/run-async-2.3.0.tgz#0371ab4ae0bdd720d4166d7dfda64ff7a445a6c0"
+ integrity sha1-A3GrSuC91yDUFm19/aZP96RFpsA=
dependencies:
is-promise "^2.1.0"
@@ -8634,127 +8085,88 @@ run-node@^1.0.0:
resolved "https://registry.yarnpkg.com/run-node/-/run-node-1.0.0.tgz#46b50b946a2aa2d4947ae1d886e9856fd9cabe5e"
integrity sha512-kc120TBlQ3mih1LSzdAJXo4xn/GWS2ec0l3S+syHDXP9uRr0JAT8Qd3mdMuyjqCzeZktgP3try92cEgf9Nks8A==
+run-parallel@^1.1.9:
+ version "1.1.9"
+ resolved "https://registry.yarnpkg.com/run-parallel/-/run-parallel-1.1.9.tgz#c9dd3a7cf9f4b2c4b6244e173a6ed866e61dd679"
+ integrity sha512-DEqnSRTDw/Tc3FXf49zedI638Z9onwUotBMiUFKmrO2sdFKIbXamXGQ3Axd4qgphxKB4kw/qP1w5kTxnfU1B9Q==
+
run-queue@^1.0.0, run-queue@^1.0.3:
version "1.0.3"
- resolved "http://registry.npm.taobao.org/run-queue/download/run-queue-1.0.3.tgz#e848396f057d223f24386924618e25694161ec47"
+ resolved "https://registry.yarnpkg.com/run-queue/-/run-queue-1.0.3.tgz#e848396f057d223f24386924618e25694161ec47"
+ integrity sha1-6Eg5bwV9Ij8kOGkkYY4laUFh7Ec=
dependencies:
aproba "^1.1.1"
-rx-lite-aggregates@^4.0.8:
- version "4.0.8"
- resolved "http://registry.npm.taobao.org/rx-lite-aggregates/download/rx-lite-aggregates-4.0.8.tgz#753b87a89a11c95467c4ac1626c4efc4e05c67be"
- dependencies:
- rx-lite "*"
-
-rx-lite@*, rx-lite@^4.0.8:
- version "4.0.8"
- resolved "http://registry.npm.taobao.org/rx-lite/download/rx-lite-4.0.8.tgz#0b1e11af8bc44836f04a6407e92da42467b79444"
-
-rx@^4.1.0:
- version "4.1.0"
- resolved "http://registry.npm.taobao.org/rx/download/rx-4.1.0.tgz#a5f13ff79ef3b740fe30aa803fb09f98805d4782"
-
-rxjs-tslint-rules@^4.0.0:
- version "4.3.0"
- resolved "http://registry.npm.taobao.org/rxjs-tslint-rules/download/rxjs-tslint-rules-4.3.0.tgz#bc11b1dd7b4d7b451da093c517d90ead8501e340"
- dependencies:
- decamelize "^2.0.0"
- resolve "^1.4.0"
- tslib "^1.8.0"
-
[email protected]:
- version "5.5.11"
- resolved "http://registry.npm.taobao.org/rxjs/download/rxjs-5.5.11.tgz#f733027ca43e3bec6b994473be4ab98ad43ced87"
+rxjs@^6.1.0, rxjs@^6.4.0:
+ version "6.5.2"
+ resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-6.5.2.tgz#2e35ce815cd46d84d02a209fb4e5921e051dbec7"
+ integrity sha512-HUb7j3kvb7p7eCUHE3FqjoDsC1xfZQ4AHFWfTKSpZ+sAhhz5X1WX0ZuUqWbzB2QhSLp3DoLUG+hMdEDKqWo2Zg==
dependencies:
- symbol-observable "1.0.1"
-
[email protected]:
- version "5.1.1"
- resolved "http://registry.npm.taobao.org/safe-buffer/download/safe-buffer-5.1.1.tgz#893312af69b2123def71f57889001671eeb2c853"
+ tslib "^1.9.0"
-safe-buffer@^5.0.1, safe-buffer@^5.1.0, safe-buffer@^5.1.1, safe-buffer@^5.1.2, safe-buffer@~5.1.0, safe-buffer@~5.1.1:
[email protected], safe-buffer@>=5.1.0, safe-buffer@^5.0.1, safe-buffer@^5.1.0, safe-buffer@^5.1.1, safe-buffer@^5.1.2, safe-buffer@~5.1.0, safe-buffer@~5.1.1:
version "5.1.2"
- resolved "http://registry.npm.taobao.org/safe-buffer/download/safe-buffer-5.1.2.tgz#991ec69d296e0313747d59bdfd2b745c35f8828d"
+ resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.2.tgz#991ec69d296e0313747d59bdfd2b745c35f8828d"
+ integrity sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==
safe-regex@^1.1.0:
version "1.1.0"
- resolved "http://registry.npm.taobao.org/safe-regex/download/safe-regex-1.1.0.tgz#40a3669f3b077d1e943d44629e157dd48023bf2e"
+ resolved "https://registry.yarnpkg.com/safe-regex/-/safe-regex-1.1.0.tgz#40a3669f3b077d1e943d44629e157dd48023bf2e"
+ integrity sha1-QKNmnzsHfR6UPURinhV91IAjvy4=
dependencies:
ret "~0.1.10"
-"safer-buffer@>= 2.1.2 < 3":
+"safer-buffer@>= 2.1.2 < 3", safer-buffer@^2.0.2, safer-buffer@^2.1.0, safer-buffer@~2.1.0:
version "2.1.2"
- resolved "http://registry.npm.taobao.org/safer-buffer/download/safer-buffer-2.1.2.tgz#44fa161b0187b9549dd84bb91802f9bd8385cd6a"
+ resolved "https://registry.yarnpkg.com/safer-buffer/-/safer-buffer-2.1.2.tgz#44fa161b0187b9549dd84bb91802f9bd8385cd6a"
+ integrity sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==
[email protected]:
- version "1.3.0"
- resolved "http://registry.npm.taobao.org/samsam/download/samsam-1.3.0.tgz#8d1d9350e25622da30de3e44ba692b5221ab7c50"
-
-sane@^2.0.0:
- version "2.5.2"
- resolved "http://registry.npm.taobao.org/sane/download/sane-2.5.2.tgz#b4dc1861c21b427e929507a3e751e2a2cb8ab3fa"
+sane@^4.0.3:
+ version "4.1.0"
+ resolved "https://registry.yarnpkg.com/sane/-/sane-4.1.0.tgz#ed881fd922733a6c461bc189dc2b6c006f3ffded"
+ integrity sha512-hhbzAgTIX8O7SHfp2c8/kREfEn4qO/9q8C9beyY6+tvZ87EpoZ3i1RIEvp27YBswnNbY9mWd6paKVmKbAgLfZA==
dependencies:
+ "@cnakazawa/watch" "^1.0.3"
anymatch "^2.0.0"
- capture-exit "^1.2.0"
- exec-sh "^0.2.0"
+ capture-exit "^2.0.0"
+ exec-sh "^0.3.2"
+ execa "^1.0.0"
fb-watchman "^2.0.0"
micromatch "^3.1.4"
minimist "^1.1.1"
walker "~1.0.5"
- watch "~0.18.0"
- optionalDependencies:
- fsevents "^1.2.3"
-
-sass-graph@^2.2.4:
- version "2.2.4"
- resolved "http://registry.npm.taobao.org/sass-graph/download/sass-graph-2.2.4.tgz#13fbd63cd1caf0908b9fd93476ad43a51d1e0b49"
- dependencies:
- glob "^7.0.0"
- lodash "^4.0.0"
- scss-tokenizer "^0.2.3"
- yargs "^7.0.0"
-
-sass-loader@^6.0.6:
- version "6.0.7"
- resolved "http://registry.npm.taobao.org/sass-loader/download/sass-loader-6.0.7.tgz#dd2fdb3e7eeff4a53f35ba6ac408715488353d00"
- dependencies:
- clone-deep "^2.0.1"
- loader-utils "^1.0.1"
- lodash.tail "^4.1.1"
- neo-async "^2.5.0"
- pify "^3.0.0"
-sax@^1.2.4, sax@~1.2.1:
+sax@^1.2.4:
version "1.2.4"
- resolved "http://registry.npm.taobao.org/sax/download/sax-1.2.4.tgz#2816234e2378bddc4e5354fab5caa895df7100d9"
+ resolved "https://registry.yarnpkg.com/sax/-/sax-1.2.4.tgz#2816234e2378bddc4e5354fab5caa895df7100d9"
+ integrity sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw==
-schema-utils@^0.3.0:
- version "0.3.0"
- resolved "http://registry.npm.taobao.org/schema-utils/download/schema-utils-0.3.0.tgz#f5877222ce3e931edae039f17eb3716e7137f8cf"
+scheduler@^0.13.6:
+ version "0.13.6"
+ resolved "https://registry.yarnpkg.com/scheduler/-/scheduler-0.13.6.tgz#466a4ec332467b31a91b9bf74e5347072e4cd889"
+ integrity sha512-IWnObHt413ucAYKsD9J1QShUKkbKLQQHdxRyw73sw4FN26iWr3DY/H34xGPe4nmL1DwXyWmSWmMrA9TfQbE/XQ==
dependencies:
- ajv "^5.0.0"
+ loose-envify "^1.1.0"
+ object-assign "^4.1.1"
-schema-utils@^0.4.0, schema-utils@^0.4.3, schema-utils@^0.4.5:
- version "0.4.5"
- resolved "http://registry.npm.taobao.org/schema-utils/download/schema-utils-0.4.5.tgz#21836f0608aac17b78f9e3e24daff14a5ca13a3e"
+schema-utils@^1.0.0:
+ version "1.0.0"
+ resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-1.0.0.tgz#0b79a93204d7b600d4b2850d1f66c2a34951c770"
+ integrity sha512-i27Mic4KovM/lnGsy8whRCHhc7VicJajAjTrYg11K9zfZXnYIt4k5F+kZkwjnrhKzLic/HLU4j11mjsz2G/75g==
dependencies:
ajv "^6.1.0"
+ ajv-errors "^1.0.0"
ajv-keywords "^3.1.0"
-scss-tokenizer@^0.2.3:
- version "0.2.3"
- resolved "http://registry.npm.taobao.org/scss-tokenizer/download/scss-tokenizer-0.2.3.tgz#8eb06db9a9723333824d3f5530641149847ce5d1"
- dependencies:
- js-base64 "^2.1.8"
- source-map "^0.4.2"
-
select-hose@^2.0.0:
version "2.0.0"
- resolved "http://registry.npm.taobao.org/select-hose/download/select-hose-2.0.0.tgz#625d8658f865af43ec962bfc376a37359a4994ca"
+ resolved "https://registry.yarnpkg.com/select-hose/-/select-hose-2.0.0.tgz#625d8658f865af43ec962bfc376a37359a4994ca"
+ integrity sha1-Yl2GWPhlr0Psliv8N2o3NZpJlMo=
-selfsigned@^1.9.1:
- version "1.10.3"
- resolved "http://registry.npm.taobao.org/selfsigned/download/selfsigned-1.10.3.tgz#d628ecf9e3735f84e8bafba936b3cf85bea43823"
+selfsigned@^1.10.4:
+ version "1.10.4"
+ resolved "https://registry.yarnpkg.com/selfsigned/-/selfsigned-1.10.4.tgz#cdd7eccfca4ed7635d47a08bf2d5d3074092e2cd"
+ integrity sha512-9AukTiDmHXGXWtWjembZ5NDmVvP2695EtpgbCsxCa68w3c88B+alqbmZ4O3hZ4VWGXeGWzEVdvqgAJD8DQPCDw==
dependencies:
node-forge "0.7.5"
@@ -8763,17 +8175,30 @@ semver-compare@^1.0.0:
resolved "https://registry.yarnpkg.com/semver-compare/-/semver-compare-1.0.0.tgz#0dee216a1c941ab37e9efb1788f6afc5ff5537fc"
integrity sha1-De4hahyUGrN+nvsXiPavxf9VN/w=
-"semver@2 || 3 || 4 || 5", [email protected], semver@^5.0.1, semver@^5.1.0, semver@^5.3.0, semver@^5.4.1, semver@^5.5.0:
+"semver@2 || 3 || 4 || 5", semver@^5.3.0, semver@^5.4.1, semver@^5.5.0, semver@^5.5.1, semver@^5.6.0:
+ version "5.7.0"
+ resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.0.tgz#790a7cf6fea5459bac96110b29b60412dc8ff96b"
+ integrity sha512-Ya52jSX2u7QKghxeoFGpLwCtGlt7j0oY9DYb5apt9nPlJ42ID+ulTXESnt/qAQcoSERyZ5sl3LDIOw0nAn/5DA==
+
[email protected]:
version "5.5.0"
- resolved "http://registry.npm.taobao.org/semver/download/semver-5.5.0.tgz#dc4bbc7a6ca9d916dee5d43516f0092b58f7b8ab"
+ resolved "https://registry.yarnpkg.com/semver/-/semver-5.5.0.tgz#dc4bbc7a6ca9d916dee5d43516f0092b58f7b8ab"
+ integrity sha512-4SJ3dm0WAwWy/NVeioZh5AntkdJoWKxHxcmyP622fOkgHa4z3R0TdBJICINyaSDE6uNwVc8gZr+ZinwZAH4xIA==
-semver@~5.3.0:
- version "5.3.0"
- resolved "http://registry.npm.taobao.org/semver/download/semver-5.3.0.tgz#9b2ce5d3de02d17c6012ad326aa6b4d0cf54f94f"
[email protected]:
+ version "6.0.0"
+ resolved "https://registry.yarnpkg.com/semver/-/semver-6.0.0.tgz#05e359ee571e5ad7ed641a6eec1e547ba52dea65"
+ integrity sha512-0UewU+9rFapKFnlbirLi3byoOuhrSsli/z/ihNnvM24vgF+8sNBiI1LZPBSH9wJKUwaUbw+s3hToDLCXkrghrQ==
[email protected]:
- version "0.16.2"
- resolved "http://registry.npm.taobao.org/send/download/send-0.16.2.tgz#6ecca1e0f8c156d141597559848df64730a6bbc1"
+semver@^6.0.0, semver@^6.1.0, semver@^6.1.1:
+ version "6.2.0"
+ resolved "https://registry.yarnpkg.com/semver/-/semver-6.2.0.tgz#4d813d9590aaf8a9192693d6c85b9344de5901db"
+ integrity sha512-jdFC1VdUGT/2Scgbimf7FSx9iJLXoqfglSF+gJeuNWVpiE37OIbc1jywR/GJyFdz3mnkz2/id0L0J/cr0izR5A==
+
[email protected]:
+ version "0.17.1"
+ resolved "https://registry.yarnpkg.com/send/-/send-0.17.1.tgz#c1d8b059f7900f7466dd4938bdc44e11ddb376c8"
+ integrity sha512-BsVKsiGcQMFwT8UxypobUKyv7irCNRHk1T0G680vk88yf6LBByGcZJOTJCrTP2xVN6yI+XjPJcNuE3V4fT9sAg==
dependencies:
debug "2.6.9"
depd "~1.1.2"
@@ -8782,20 +8207,22 @@ [email protected]:
escape-html "~1.0.3"
etag "~1.8.1"
fresh "0.5.2"
- http-errors "~1.6.2"
- mime "1.4.1"
- ms "2.0.0"
+ http-errors "~1.7.2"
+ mime "1.6.0"
+ ms "2.1.1"
on-finished "~2.3.0"
- range-parser "~1.2.0"
- statuses "~1.4.0"
+ range-parser "~1.2.1"
+ statuses "~1.5.0"
-serialize-javascript@^1.4.0:
- version "1.5.0"
- resolved "http://registry.npm.taobao.org/serialize-javascript/download/serialize-javascript-1.5.0.tgz#1aa336162c88a890ddad5384baebc93a655161fe"
+serialize-javascript@^1.4.0, serialize-javascript@^1.7.0:
+ version "1.7.0"
+ resolved "https://registry.yarnpkg.com/serialize-javascript/-/serialize-javascript-1.7.0.tgz#d6e0dfb2a3832a8c94468e6eb1db97e55a192a65"
+ integrity sha512-ke8UG8ulpFOxO8f8gRYabHQe/ZntKlcig2Mp+8+URDP1D8vJZ0KUt7LYo07q25Z/+JVSgpr/cui9PIp5H6/+nA==
-serve-index@^1.7.2:
+serve-index@^1.9.1:
version "1.9.1"
- resolved "http://registry.npm.taobao.org/serve-index/download/serve-index-1.9.1.tgz#d3768d69b1e7d82e5ce050fff5b453bea12a9239"
+ resolved "https://registry.yarnpkg.com/serve-index/-/serve-index-1.9.1.tgz#d3768d69b1e7d82e5ce050fff5b453bea12a9239"
+ integrity sha1-03aNabHn2C5c4FD/9bRTvqEqkjk=
dependencies:
accepts "~1.3.4"
batch "0.6.1"
@@ -8805,104 +8232,75 @@ serve-index@^1.7.2:
mime-types "~2.1.17"
parseurl "~1.3.2"
[email protected]:
- version "1.13.2"
- resolved "http://registry.npm.taobao.org/serve-static/download/serve-static-1.13.2.tgz#095e8472fd5b46237db50ce486a43f4b86c6cec1"
[email protected]:
+ version "1.14.1"
+ resolved "https://registry.yarnpkg.com/serve-static/-/serve-static-1.14.1.tgz#666e636dc4f010f7ef29970a88a674320898b2f9"
+ integrity sha512-JMrvUwE54emCYWlTI+hGrGv5I8dEwmco/00EvkzIIsR7MqrHonbD9pO2MOfFnpFntl7ecpZs+3mW+XbQZu9QCg==
dependencies:
encodeurl "~1.0.2"
escape-html "~1.0.3"
- parseurl "~1.3.2"
- send "0.16.2"
+ parseurl "~1.3.3"
+ send "0.17.1"
set-blocking@^2.0.0, set-blocking@~2.0.0:
version "2.0.0"
- resolved "http://registry.npm.taobao.org/set-blocking/download/set-blocking-2.0.0.tgz#045f9782d011ae9a6803ddd382b24392b3d890f7"
-
-set-immediate-shim@^1.0.1:
- version "1.0.1"
- resolved "http://registry.npm.taobao.org/set-immediate-shim/download/set-immediate-shim-1.0.1.tgz#4b2b1b27eb808a9f8dcc481a58e5e56f599f3f61"
-
-set-value@^0.4.3:
- version "0.4.3"
- resolved "http://registry.npm.taobao.org/set-value/download/set-value-0.4.3.tgz#7db08f9d3d22dc7f78e53af3c3bf4666ecdfccf1"
- dependencies:
- extend-shallow "^2.0.1"
- is-extendable "^0.1.1"
- is-plain-object "^2.0.1"
- to-object-path "^0.3.0"
+ resolved "https://registry.yarnpkg.com/set-blocking/-/set-blocking-2.0.0.tgz#045f9782d011ae9a6803ddd382b24392b3d890f7"
+ integrity sha1-BF+XgtARrppoA93TgrJDkrPYkPc=
-set-value@^2.0.0:
- version "2.0.0"
- resolved "http://registry.npm.taobao.org/set-value/download/set-value-2.0.0.tgz#71ae4a88f0feefbbf52d1ea604f3fb315ebb6274"
+set-value@^2.0.0, set-value@^2.0.1:
+ version "2.0.1"
+ resolved "https://registry.yarnpkg.com/set-value/-/set-value-2.0.1.tgz#a18d40530e6f07de4228c7defe4227af8cad005b"
+ integrity sha512-JxHc1weCN68wRY0fhCoXpyK55m/XPHafOmK4UWD7m2CI14GMcFypt4w/0+NV5f/ZMby2F6S2wwA7fgynh9gWSw==
dependencies:
extend-shallow "^2.0.1"
is-extendable "^0.1.1"
is-plain-object "^2.0.3"
split-string "^3.0.1"
-setimmediate@^1.0.4, setimmediate@^1.0.5:
+setimmediate@^1.0.4:
version "1.0.5"
- resolved "http://registry.npm.taobao.org/setimmediate/download/setimmediate-1.0.5.tgz#290cbb232e306942d7d7ea9b83732ab7856f8285"
-
[email protected]:
- version "1.0.3"
- resolved "http://registry.npm.taobao.org/setprototypeof/download/setprototypeof-1.0.3.tgz#66567e37043eeb4f04d91bd658c0cbefb55b8e04"
+ resolved "https://registry.yarnpkg.com/setimmediate/-/setimmediate-1.0.5.tgz#290cbb232e306942d7d7ea9b83732ab7856f8285"
+ integrity sha1-KQy7Iy4waULX1+qbg3Mqt4VvgoU=
[email protected]:
version "1.1.0"
- resolved "http://registry.npm.taobao.org/setprototypeof/download/setprototypeof-1.1.0.tgz#d0bd85536887b6fe7c0d818cb962d9d91c54e656"
+ resolved "https://registry.yarnpkg.com/setprototypeof/-/setprototypeof-1.1.0.tgz#d0bd85536887b6fe7c0d818cb962d9d91c54e656"
+ integrity sha512-BvE/TwpZX4FXExxOxZyRGQQv651MSwmWKZGqvmPcRIjDqWub67kTKuIMx43cZZrS/cBBzwBcNDWoFxt2XEFIpQ==
+
[email protected]:
+ version "1.1.1"
+ resolved "https://registry.yarnpkg.com/setprototypeof/-/setprototypeof-1.1.1.tgz#7e95acb24aa92f5885e0abef5ba131330d4ae683"
+ integrity sha512-JvdAWfbXeIGaZ9cILp38HntZSFSo3mWg6xGcJJsd+d4aRMOqauag1C63dJfDw7OaMYwEbHMOxEZ1lqVRYP2OAw==
sha.js@^2.4.0, sha.js@^2.4.8:
version "2.4.11"
- resolved "http://registry.npm.taobao.org/sha.js/download/sha.js-2.4.11.tgz#37a5cf0b81ecbc6943de109ba2960d1b26584ae7"
+ resolved "https://registry.yarnpkg.com/sha.js/-/sha.js-2.4.11.tgz#37a5cf0b81ecbc6943de109ba2960d1b26584ae7"
+ integrity sha512-QMEp5B7cftE7APOjk5Y6xgrbWu+WkLVQwk8JNjZ8nKRciZaByEW6MubieAiToS7+dwvrjGhH8jRXz3MVd0AYqQ==
dependencies:
inherits "^2.0.1"
safe-buffer "^5.0.1"
-shallow-clone@^1.0.0:
- version "1.0.0"
- resolved "http://registry.npm.taobao.org/shallow-clone/download/shallow-clone-1.0.0.tgz#4480cd06e882ef68b2ad88a3ea54832e2c48b571"
- dependencies:
- is-extendable "^0.1.1"
- kind-of "^5.0.0"
- mixin-object "^2.0.1"
-
-shallow-equal@^1.0.0:
- version "1.0.0"
- resolved "http://registry.npm.taobao.org/shallow-equal/download/shallow-equal-1.0.0.tgz#508d1838b3de590ab8757b011b25e430900945f7"
-
-shallowequal@^0.2.2:
- version "0.2.2"
- resolved "http://registry.npm.taobao.org/shallowequal/download/shallowequal-0.2.2.tgz#1e32fd5bcab6ad688a4812cb0cc04efc75c7014e"
- dependencies:
- lodash.keys "^3.1.2"
-
-shallowequal@^1.0.1, shallowequal@^1.0.2:
- version "1.0.2"
- resolved "http://registry.npm.taobao.org/shallowequal/download/shallowequal-1.0.2.tgz#1561dbdefb8c01408100319085764da3fcf83f8f"
+shallowequal@^1.0.2:
+ version "1.1.0"
+ resolved "https://registry.yarnpkg.com/shallowequal/-/shallowequal-1.1.0.tgz#188d521de95b9087404fd4dcb68b13df0ae4e7f8"
+ integrity sha512-y0m1JoUZSlPAjXVtPPW70aZWfIL/dSP7AFkRnniLCrK/8MDKog3TySTBmckD+RObVxH0v4Tox67+F14PdED2oQ==
shebang-command@^1.2.0:
version "1.2.0"
- resolved "http://registry.npm.taobao.org/shebang-command/download/shebang-command-1.2.0.tgz#44aac65b695b03398968c39f363fee5deafdf1ea"
+ resolved "https://registry.yarnpkg.com/shebang-command/-/shebang-command-1.2.0.tgz#44aac65b695b03398968c39f363fee5deafdf1ea"
+ integrity sha1-RKrGW2lbAzmJaMOfNj/uXer98eo=
dependencies:
shebang-regex "^1.0.0"
shebang-regex@^1.0.0:
version "1.0.0"
- resolved "http://registry.npm.taobao.org/shebang-regex/download/shebang-regex-1.0.0.tgz#da42f49740c0b42db2ca9728571cb190c98efea3"
-
[email protected], shell-quote@^1.6.1:
- version "1.6.1"
- resolved "http://registry.npm.taobao.org/shell-quote/download/shell-quote-1.6.1.tgz#f4781949cce402697127430ea3b3c5476f481767"
- dependencies:
- array-filter "~0.0.0"
- array-map "~0.0.0"
- array-reduce "~0.0.0"
- jsonify "~0.0.0"
+ resolved "https://registry.yarnpkg.com/shebang-regex/-/shebang-regex-1.0.0.tgz#da42f49740c0b42db2ca9728571cb190c98efea3"
+ integrity sha1-2kL0l0DAtC2yypcoVxyxkMmO/qM=
[email protected]:
version "0.7.6"
- resolved "http://registry.npm.taobao.org/shelljs/download/shelljs-0.7.6.tgz#379cccfb56b91c8601e4793356eb5382924de9ad"
+ resolved "https://registry.yarnpkg.com/shelljs/-/shelljs-0.7.6.tgz#379cccfb56b91c8601e4793356eb5382924de9ad"
+ integrity sha1-N5zM+1a5HIYB5HkzVutTgpJN6a0=
dependencies:
glob "^7.0.0"
interpret "^1.0.0"
@@ -8910,44 +8308,69 @@ [email protected]:
shellwords@^0.1.1:
version "0.1.1"
- resolved "http://registry.npm.taobao.org/shellwords/download/shellwords-0.1.1.tgz#d6b9181c1a48d397324c84871efbcfc73fc0654b"
+ resolved "https://registry.yarnpkg.com/shellwords/-/shellwords-0.1.1.tgz#d6b9181c1a48d397324c84871efbcfc73fc0654b"
+ integrity sha512-vFwSUfQvqybiICwZY5+DAWIPLKsWO31Q91JSKl3UYv+K5c2QRPzn0qzec6QPu1Qc9eHYItiP3NdJqNVqetYAww==
signal-exit@^3.0.0, signal-exit@^3.0.2:
version "3.0.2"
- resolved "http://registry.npm.taobao.org/signal-exit/download/signal-exit-3.0.2.tgz#b5fdc08f1287ea1178628e415e25132b73646c6d"
+ resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.2.tgz#b5fdc08f1287ea1178628e415e25132b73646c6d"
+ integrity sha1-tf3AjxKH6hF4Yo5BXiUTK3NkbG0=
-sinon-chrome@^2.2.4:
- version "2.3.2"
- resolved "http://registry.npm.taobao.org/sinon-chrome/download/sinon-chrome-2.3.2.tgz#0e4253bd1eceaffa57e2164bc817c2c7b4ef3912"
+sinon-chrome@^3.0.1:
+ version "3.0.1"
+ resolved "https://registry.yarnpkg.com/sinon-chrome/-/sinon-chrome-3.0.1.tgz#9fb14c230fa0959cb280f9f589e9eda8ccfda1d9"
+ integrity sha512-NTEFhyuiWEMnRmIqldUiA2DhKn2EqnZxyEk5Ez5rBXj+Nl54aJ0MEmF4wjltrxecxd8zlNLxyE0HyLabev9JsQ==
dependencies:
lodash "^4.16.3"
- sinon "^4.4.2"
+ sinon "^7.2.3"
urijs "^1.18.2"
-sinon@^4.4.2:
- version "4.5.0"
- resolved "http://registry.npm.taobao.org/sinon/download/sinon-4.5.0.tgz#427ae312a337d3c516804ce2754e8c0d5028cb04"
+sinon@^7.2.3:
+ version "7.3.2"
+ resolved "https://registry.yarnpkg.com/sinon/-/sinon-7.3.2.tgz#82dba3a6d85f6d2181e1eca2c10d8657c2161f28"
+ integrity sha512-thErC1z64BeyGiPvF8aoSg0LEnptSaWE7YhdWWbWXgelOyThent7uKOnnEh9zBxDbKixtr5dEko+ws1sZMuFMA==
dependencies:
- "@sinonjs/formatio" "^2.0.0"
- diff "^3.1.0"
- lodash.get "^4.4.2"
- lolex "^2.2.0"
- nise "^1.2.0"
- supports-color "^5.1.0"
- type-detect "^4.0.5"
+ "@sinonjs/commons" "^1.4.0"
+ "@sinonjs/formatio" "^3.2.1"
+ "@sinonjs/samsam" "^3.3.1"
+ diff "^3.5.0"
+ lolex "^4.0.1"
+ nise "^1.4.10"
+ supports-color "^5.5.0"
+
+sisteransi@^1.0.0:
+ version "1.0.2"
+ resolved "https://registry.yarnpkg.com/sisteransi/-/sisteransi-1.0.2.tgz#ec57d64b6f25c4f26c0e2c7dd23f2d7f12f7e418"
+ integrity sha512-ZcYcZcT69nSLAR2oLN2JwNmLkJEKGooFMCdvOkFrToUt/WfcRWqhIg4P4KwY4dmLbuyXIx4o4YmPsvMRJYJd/w==
slash@^1.0.0:
version "1.0.0"
- resolved "http://registry.npm.taobao.org/slash/download/slash-1.0.0.tgz#c41f2f6c39fc16d1cd17ad4b5d896114ae470d55"
+ resolved "https://registry.yarnpkg.com/slash/-/slash-1.0.0.tgz#c41f2f6c39fc16d1cd17ad4b5d896114ae470d55"
+ integrity sha1-xB8vbDn8FtHNF61LXYlhFK5HDVU=
slash@^2.0.0:
version "2.0.0"
resolved "https://registry.yarnpkg.com/slash/-/slash-2.0.0.tgz#de552851a1759df3a8f206535442f5ec4ddeab44"
integrity sha512-ZYKh3Wh2z1PpEXWr0MpSBZ0V6mZHAQfYevttO11c51CaWjGTaadiKZ+wVt1PbMlDV5qhMFslpZCemhwOK7C89A==
+slash@^3.0.0:
+ version "3.0.0"
+ resolved "https://registry.yarnpkg.com/slash/-/slash-3.0.0.tgz#6539be870c165adbd5240220dbe361f1bc4d4634"
+ integrity sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==
+
+slice-ansi@^2.1.0:
+ version "2.1.0"
+ resolved "https://registry.yarnpkg.com/slice-ansi/-/slice-ansi-2.1.0.tgz#cacd7693461a637a5788d92a7dd4fba068e81636"
+ integrity sha512-Qu+VC3EwYLldKa1fCxuuvULvSJOKEgk9pi8dZeCVK7TqBfUNTH4sFkk4joj8afVSfAYgJoSOetjx9QWOJ5mYoQ==
+ dependencies:
+ ansi-styles "^3.2.0"
+ astral-regex "^1.0.0"
+ is-fullwidth-code-point "^2.0.0"
+
snapdragon-node@^2.0.1:
version "2.1.1"
- resolved "http://registry.npm.taobao.org/snapdragon-node/download/snapdragon-node-2.1.1.tgz#6c175f86ff14bdb0724563e8f3c1b021a286853b"
+ resolved "https://registry.yarnpkg.com/snapdragon-node/-/snapdragon-node-2.1.1.tgz#6c175f86ff14bdb0724563e8f3c1b021a286853b"
+ integrity sha512-O27l4xaMYt/RSQ5TR3vpWCAB5Kb/czIcqUFOM/C4fYcLnbZUc1PkjTAMjof2pBWaSTwOUd6qUHcFGVGj7aIwnw==
dependencies:
define-property "^1.0.0"
isobject "^3.0.0"
@@ -8955,13 +8378,15 @@ snapdragon-node@^2.0.1:
snapdragon-util@^3.0.1:
version "3.0.1"
- resolved "http://registry.npm.taobao.org/snapdragon-util/download/snapdragon-util-3.0.1.tgz#f956479486f2acd79700693f6f7b805e45ab56e2"
+ resolved "https://registry.yarnpkg.com/snapdragon-util/-/snapdragon-util-3.0.1.tgz#f956479486f2acd79700693f6f7b805e45ab56e2"
+ integrity sha512-mbKkMdQKsjX4BAL4bRYTj21edOf8cN7XHdYUJEe+Zn99hVEYcMvKPct1IqNe7+AZPirn8BCDOQBHQZknqmKlZQ==
dependencies:
kind-of "^3.2.0"
snapdragon@^0.8.1:
version "0.8.2"
- resolved "http://registry.npm.taobao.org/snapdragon/download/snapdragon-0.8.2.tgz#64922e7c565b0e14204ba1aa7d6964278d25182d"
+ resolved "https://registry.yarnpkg.com/snapdragon/-/snapdragon-0.8.2.tgz#64922e7c565b0e14204ba1aa7d6964278d25182d"
+ integrity sha512-FtyOnWN/wCHTVXOMwvSv26d+ko5vWlIDD6zoUJ7LW8vh+ZBC8QdljveRP+crNrtBwioEUWy/4dMtbBjA4ioNlg==
dependencies:
base "^0.11.1"
debug "^2.2.0"
@@ -8972,48 +8397,42 @@ snapdragon@^0.8.1:
source-map-resolve "^0.5.0"
use "^3.1.0"
[email protected]:
- version "1.0.9"
- resolved "http://registry.npm.taobao.org/sntp/download/sntp-1.0.9.tgz#6541184cc90aeea6c6e7b35e2659082443c66198"
- dependencies:
- hoek "2.x.x"
-
[email protected]:
- version "1.1.4"
- resolved "http://registry.npm.taobao.org/sockjs-client/download/sockjs-client-1.1.4.tgz#5babe386b775e4cf14e7520911452654016c8b12"
[email protected]:
+ version "1.3.0"
+ resolved "https://registry.yarnpkg.com/sockjs-client/-/sockjs-client-1.3.0.tgz#12fc9d6cb663da5739d3dc5fb6e8687da95cb177"
+ integrity sha512-R9jxEzhnnrdxLCNln0xg5uGHqMnkhPSTzUZH2eXcR03S/On9Yvoq2wyUZILRUhZCNVu2PmwWVoyuiPz8th8zbg==
dependencies:
- debug "^2.6.6"
- eventsource "0.1.6"
- faye-websocket "~0.11.0"
- inherits "^2.0.1"
+ debug "^3.2.5"
+ eventsource "^1.0.7"
+ faye-websocket "~0.11.1"
+ inherits "^2.0.3"
json3 "^3.3.2"
- url-parse "^1.1.8"
+ url-parse "^1.4.3"
[email protected]:
version "0.3.19"
- resolved "http://registry.npm.taobao.org/sockjs/download/sockjs-0.3.19.tgz#d976bbe800af7bd20ae08598d582393508993c0d"
+ resolved "https://registry.yarnpkg.com/sockjs/-/sockjs-0.3.19.tgz#d976bbe800af7bd20ae08598d582393508993c0d"
+ integrity sha512-V48klKZl8T6MzatbLlzzRNhMepEys9Y4oGFpypBFFn1gLI/QQ9HtLLyWJNbPlwGLelOVOEijUbTTJeLLI59jLw==
dependencies:
faye-websocket "^0.10.0"
uuid "^3.0.1"
-sort-keys@^1.0.0:
- version "1.1.2"
- resolved "http://registry.npm.taobao.org/sort-keys/download/sort-keys-1.1.2.tgz#441b6d4d346798f1b4e49e8920adfba0e543f9ad"
+sort-keys@^2.0.0:
+ version "2.0.0"
+ resolved "https://registry.yarnpkg.com/sort-keys/-/sort-keys-2.0.0.tgz#658535584861ec97d730d6cf41822e1f56684128"
+ integrity sha1-ZYU1WEhh7JfXMNbPQYIuH1ZoQSg=
dependencies:
is-plain-obj "^1.0.0"
-soundtouchjs@^0.1.5:
- version "0.1.5"
- resolved "https://registry.npm.taobao.org/soundtouchjs/download/soundtouchjs-0.1.5.tgz#89e6cae0fba8cf00d0928895d0a1ded1cef52cf2"
- integrity sha1-iebK4PuozwDQkoiV0KHe0c71LPI=
-
source-list-map@^2.0.0:
- version "2.0.0"
- resolved "http://registry.npm.taobao.org/source-list-map/download/source-list-map-2.0.0.tgz#aaa47403f7b245a92fbc97ea08f250d6087ed085"
+ version "2.0.1"
+ resolved "https://registry.yarnpkg.com/source-list-map/-/source-list-map-2.0.1.tgz#3993bd873bfc48479cca9ea3a547835c7c154b34"
+ integrity sha512-qnQ7gVMxGNxsiL4lEuJwe/To8UnK7fAnmbGEEH8RpLouuKbeEm0lhbQVFIrNSuB+G7tVrAlVsZgETT5nljf+Iw==
source-map-resolve@^0.5.0:
version "0.5.2"
- resolved "http://registry.npm.taobao.org/source-map-resolve/download/source-map-resolve-0.5.2.tgz#72e2cc34095543e43b2c62b2c4c10d4a9054f259"
+ resolved "https://registry.yarnpkg.com/source-map-resolve/-/source-map-resolve-0.5.2.tgz#72e2cc34095543e43b2c62b2c4c10d4a9054f259"
+ integrity sha512-MjqsvNwyz1s0k81Goz/9vRBe9SZdB09Bdw+/zYyO+3CuPk6fouTaxscHkgtE8jKvf01kVfl8riHzERQ/kefaSA==
dependencies:
atob "^2.1.1"
decode-uri-component "^0.2.0"
@@ -9021,190 +8440,201 @@ source-map-resolve@^0.5.0:
source-map-url "^0.4.0"
urix "^0.1.0"
-source-map-support@^0.4.15:
- version "0.4.18"
- resolved "http://registry.npm.taobao.org/source-map-support/download/source-map-support-0.4.18.tgz#0286a6de8be42641338594e97ccea75f0a2c585f"
- dependencies:
- source-map "^0.5.6"
-
-source-map-support@^0.5.0, source-map-support@^0.5.5:
- version "0.5.6"
- resolved "http://registry.npm.taobao.org/source-map-support/download/source-map-support-0.5.6.tgz#4435cee46b1aab62b8e8610ce60f788091c51c13"
+source-map-support@^0.5.6, source-map-support@~0.5.10:
+ version "0.5.12"
+ resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.12.tgz#b4f3b10d51857a5af0138d3ce8003b201613d599"
+ integrity sha512-4h2Pbvyy15EE02G+JOZpUCmqWJuqrs+sEkzewTm++BPi7Hvn/HwcqLAcNxYAyI0x13CpPPn+kMjl+hplXMHITQ==
dependencies:
buffer-from "^1.0.0"
source-map "^0.6.0"
source-map-url@^0.4.0:
version "0.4.0"
- resolved "http://registry.npm.taobao.org/source-map-url/download/source-map-url-0.4.0.tgz#3e935d7ddd73631b97659956d55128e87b5084a3"
+ resolved "https://registry.yarnpkg.com/source-map-url/-/source-map-url-0.4.0.tgz#3e935d7ddd73631b97659956d55128e87b5084a3"
+ integrity sha1-PpNdfd1zYxuXZZlW1VEo6HtQhKM=
[email protected], source-map@^0.5.3, source-map@^0.5.6, source-map@^0.5.7, source-map@~0.5.1:
+source-map@^0.5.0, source-map@^0.5.6, source-map@~0.5.0:
version "0.5.7"
- resolved "http://registry.npm.taobao.org/source-map/download/source-map-0.5.7.tgz#8a039d2d1021d22d1ea14c80d8ea468ba2ef3fcc"
+ resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.5.7.tgz#8a039d2d1021d22d1ea14c80d8ea468ba2ef3fcc"
+ integrity sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=
-source-map@^0.4.2, source-map@^0.4.4:
- version "0.4.4"
- resolved "http://registry.npm.taobao.org/source-map/download/source-map-0.4.4.tgz#eba4f5da9c0dc999de68032d8b4f76173652036b"
- dependencies:
- amdefine ">=0.0.4"
-
-source-map@^0.6.0, source-map@^0.6.1, source-map@~0.6.1:
+source-map@^0.6.0, source-map@^0.6.1, source-map@~0.6.0, source-map@~0.6.1:
version "0.6.1"
- resolved "http://registry.npm.taobao.org/source-map/download/source-map-0.6.1.tgz#74722af32e9614e9c287a8d0bbde48b5e2f1a263"
+ resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.6.1.tgz#74722af32e9614e9c287a8d0bbde48b5e2f1a263"
+ integrity sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==
-spawn-sync@^1.0.15:
- version "1.0.15"
- resolved "http://registry.npm.taobao.org/spawn-sync/download/spawn-sync-1.0.15.tgz#b00799557eb7fb0c8376c29d44e8a1ea67e57476"
- dependencies:
- concat-stream "^1.4.7"
- os-shim "^0.1.2"
+source-map@^0.7.3:
+ version "0.7.3"
+ resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.7.3.tgz#5302f8169031735226544092e64981f751750383"
+ integrity sha512-CkCj6giN3S+n9qrYiBTX5gystlENnRW5jZeNLHpe6aue+SrHcG5VYwujhW9s4dY31mEGsxBDrHR6oI69fTXsaQ==
spdx-correct@^3.0.0:
- version "3.0.0"
- resolved "http://registry.npm.taobao.org/spdx-correct/download/spdx-correct-3.0.0.tgz#05a5b4d7153a195bc92c3c425b69f3b2a9524c82"
+ version "3.1.0"
+ resolved "https://registry.yarnpkg.com/spdx-correct/-/spdx-correct-3.1.0.tgz#fb83e504445268f154b074e218c87c003cd31df4"
+ integrity sha512-lr2EZCctC2BNR7j7WzJ2FpDznxky1sjfxvvYEyzxNyb6lZXHODmEoJeFu4JupYlkfha1KZpJyoqiJ7pgA1qq8Q==
dependencies:
spdx-expression-parse "^3.0.0"
spdx-license-ids "^3.0.0"
spdx-exceptions@^2.1.0:
- version "2.1.0"
- resolved "http://registry.npm.taobao.org/spdx-exceptions/download/spdx-exceptions-2.1.0.tgz#2c7ae61056c714a5b9b9b2b2af7d311ef5c78fe9"
+ version "2.2.0"
+ resolved "https://registry.yarnpkg.com/spdx-exceptions/-/spdx-exceptions-2.2.0.tgz#2ea450aee74f2a89bfb94519c07fcd6f41322977"
+ integrity sha512-2XQACfElKi9SlVb1CYadKDXvoajPgBVPn/gOQLrTvHdElaVhr7ZEbqJaRnJLVNeaI4cMEAgVCeBMKF6MWRDCRA==
spdx-expression-parse@^3.0.0:
version "3.0.0"
- resolved "http://registry.npm.taobao.org/spdx-expression-parse/download/spdx-expression-parse-3.0.0.tgz#99e119b7a5da00e05491c9fa338b7904823b41d0"
+ resolved "https://registry.yarnpkg.com/spdx-expression-parse/-/spdx-expression-parse-3.0.0.tgz#99e119b7a5da00e05491c9fa338b7904823b41d0"
+ integrity sha512-Yg6D3XpRD4kkOmTpdgbUiEJFKghJH03fiC1OPll5h/0sO6neh2jqRDVHOQ4o/LMea0tgCkbMgea5ip/e+MkWyg==
dependencies:
spdx-exceptions "^2.1.0"
spdx-license-ids "^3.0.0"
spdx-license-ids@^3.0.0:
- version "3.0.0"
- resolved "http://registry.npm.taobao.org/spdx-license-ids/download/spdx-license-ids-3.0.0.tgz#7a7cd28470cc6d3a1cfe6d66886f6bc430d3ac87"
+ version "3.0.4"
+ resolved "https://registry.yarnpkg.com/spdx-license-ids/-/spdx-license-ids-3.0.4.tgz#75ecd1a88de8c184ef015eafb51b5b48bfd11bb1"
+ integrity sha512-7j8LYJLeY/Yb6ACbQ7F76qy5jHkp0U6jgBfJsk97bwWlVUnUWsAgpyaCvo17h0/RQGnQ036tVDomiwoI4pDkQA==
-spdy-transport@^2.0.18:
- version "2.1.0"
- resolved "http://registry.npm.taobao.org/spdy-transport/download/spdy-transport-2.1.0.tgz#4bbb15aaffed0beefdd56ad61dbdc8ba3e2cb7a1"
+spdy-transport@^3.0.0:
+ version "3.0.0"
+ resolved "https://registry.yarnpkg.com/spdy-transport/-/spdy-transport-3.0.0.tgz#00d4863a6400ad75df93361a1608605e5dcdcf31"
+ integrity sha512-hsLVFE5SjA6TCisWeJXFKniGGOpBgMLmerfO2aCyCU5s7nJ/rpAepqmFifv/GCbSbueEeAJJnmSQ2rKC/g8Fcw==
dependencies:
- debug "^2.6.8"
- detect-node "^2.0.3"
+ debug "^4.1.0"
+ detect-node "^2.0.4"
hpack.js "^2.1.6"
- obuf "^1.1.1"
- readable-stream "^2.2.9"
- safe-buffer "^5.0.1"
- wbuf "^1.7.2"
+ obuf "^1.1.2"
+ readable-stream "^3.0.6"
+ wbuf "^1.7.3"
-spdy@^3.4.1:
- version "3.4.7"
- resolved "http://registry.npm.taobao.org/spdy/download/spdy-3.4.7.tgz#42ff41ece5cc0f99a3a6c28aabb73f5c3b03acbc"
+spdy@^4.0.0:
+ version "4.0.0"
+ resolved "https://registry.yarnpkg.com/spdy/-/spdy-4.0.0.tgz#81f222b5a743a329aa12cea6a390e60e9b613c52"
+ integrity sha512-ot0oEGT/PGUpzf/6uk4AWLqkq+irlqHXkrdbk51oWONh3bxQmBuljxPNl66zlRRcIJStWq0QkLUCPOPjgjvU0Q==
dependencies:
- debug "^2.6.8"
- handle-thing "^1.2.5"
+ debug "^4.1.0"
+ handle-thing "^2.0.0"
http-deceiver "^1.2.7"
- safe-buffer "^5.0.1"
select-hose "^2.0.0"
- spdy-transport "^2.0.18"
+ spdy-transport "^3.0.0"
split-string@^3.0.1, split-string@^3.0.2:
version "3.1.0"
- resolved "http://registry.npm.taobao.org/split-string/download/split-string-3.1.0.tgz#7cb09dda3a86585705c64b39a6466038682e8fe2"
+ resolved "https://registry.yarnpkg.com/split-string/-/split-string-3.1.0.tgz#7cb09dda3a86585705c64b39a6466038682e8fe2"
+ integrity sha512-NzNVhJDYpwceVVii8/Hu6DKfD2G+NrQHlS/V/qgv763EYudVwEcMQNxd2lh+0VrUByXN/oJkl5grOhYWvQUYiw==
dependencies:
extend-shallow "^3.0.0"
split2@^2.0.0:
version "2.2.0"
- resolved "http://registry.npm.taobao.org/split2/download/split2-2.2.0.tgz#186b2575bcf83e85b7d18465756238ee4ee42493"
+ resolved "https://registry.yarnpkg.com/split2/-/split2-2.2.0.tgz#186b2575bcf83e85b7d18465756238ee4ee42493"
+ integrity sha512-RAb22TG39LhI31MbreBgIuKiIKhVsawfTgEGqKHTK87aG+ul/PB8Sqoi3I7kVdRWiCfrKxK3uo4/YUkpNvhPbw==
dependencies:
through2 "^2.0.2"
split@^1.0.0:
version "1.0.1"
- resolved "http://registry.npm.taobao.org/split/download/split-1.0.1.tgz#605bd9be303aa59fb35f9229fbea0ddec9ea07d9"
+ resolved "https://registry.yarnpkg.com/split/-/split-1.0.1.tgz#605bd9be303aa59fb35f9229fbea0ddec9ea07d9"
+ integrity sha512-mTyOoPbrivtXnwnIxZRFYRrPNtEFKlpB2fvjSnCQUiAA6qAZzqwna5envK4uk6OIeP17CsdF3rSBGYVBsU0Tkg==
dependencies:
through "2"
sprintf-js@~1.0.2:
version "1.0.3"
- resolved "http://registry.npm.taobao.org/sprintf-js/download/sprintf-js-1.0.3.tgz#04e6926f662895354f3dd015203633b857297e2c"
+ resolved "https://registry.yarnpkg.com/sprintf-js/-/sprintf-js-1.0.3.tgz#04e6926f662895354f3dd015203633b857297e2c"
+ integrity sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw=
sshpk@^1.7.0:
- version "1.14.1"
- resolved "http://registry.npm.taobao.org/sshpk/download/sshpk-1.14.1.tgz#130f5975eddad963f1d56f92b9ac6c51fa9f83eb"
+ version "1.16.1"
+ resolved "https://registry.yarnpkg.com/sshpk/-/sshpk-1.16.1.tgz#fb661c0bef29b39db40769ee39fa70093d6f6877"
+ integrity sha512-HXXqVUq7+pcKeLqqZj6mHFUMvXtOJt1uoUx09pFW6011inTMxqI8BA8PM95myrIyyKwdnzjdFjLiE6KBPVtJIg==
dependencies:
asn1 "~0.2.3"
assert-plus "^1.0.0"
- dashdash "^1.12.0"
- getpass "^0.1.1"
- optionalDependencies:
bcrypt-pbkdf "^1.0.0"
+ dashdash "^1.12.0"
ecc-jsbn "~0.1.1"
+ getpass "^0.1.1"
jsbn "~0.1.0"
+ safer-buffer "^2.0.2"
tweetnacl "~0.14.0"
ssri@^5.2.4:
version "5.3.0"
- resolved "http://registry.npm.taobao.org/ssri/download/ssri-5.3.0.tgz#ba3872c9c6d33a0704a7d71ff045e5ec48999d06"
+ resolved "https://registry.yarnpkg.com/ssri/-/ssri-5.3.0.tgz#ba3872c9c6d33a0704a7d71ff045e5ec48999d06"
+ integrity sha512-XRSIPqLij52MtgoQavH/x/dU1qVKtWUAAZeOHsR9c2Ddi4XerFy3mc1alf+dLJKl9EUIm/Ht+EowFkTUOA6GAQ==
dependencies:
safe-buffer "^5.1.1"
-stack-utils@^1.0.1:
- version "1.0.1"
- resolved "http://registry.npm.taobao.org/stack-utils/download/stack-utils-1.0.1.tgz#d4f33ab54e8e38778b0ca5cfd3b3afb12db68620"
-
-standard-version@^4.3.0:
- version "4.4.0"
- resolved "http://registry.npm.taobao.org/standard-version/download/standard-version-4.4.0.tgz#99de7a0709e6cafddf9c5984dd342c8cfe66e79f"
+ssri@^6.0.1:
+ version "6.0.1"
+ resolved "https://registry.yarnpkg.com/ssri/-/ssri-6.0.1.tgz#2a3c41b28dd45b62b63676ecb74001265ae9edd8"
+ integrity sha512-3Wge10hNcT1Kur4PDFwEieXSCMCJs/7WvSACcrMYrNp+b8kDL1/0wJch5Ni2WrtwEa2IO8OsVfeKIciKCDx/QA==
dependencies:
- chalk "^1.1.3"
- conventional-changelog "^1.1.0"
- conventional-recommended-bump "^1.0.0"
- dotgitignore "^1.0.3"
- figures "^1.5.0"
- fs-access "^1.0.0"
- semver "^5.1.0"
- yargs "^8.0.1"
+ figgy-pudding "^3.5.1"
+
+stack-utils@^1.0.1:
+ version "1.0.2"
+ resolved "https://registry.yarnpkg.com/stack-utils/-/stack-utils-1.0.2.tgz#33eba3897788558bebfc2db059dc158ec36cebb8"
+ integrity sha512-MTX+MeG5U994cazkjd/9KNAapsHnibjMLnfXodlkXw76JEea0UiNzrqidzo1emMwk7w5Qhc9jd4Bn9TBb1MFwA==
+
+standard-version@^6.0.1:
+ version "6.0.1"
+ resolved "https://registry.yarnpkg.com/standard-version/-/standard-version-6.0.1.tgz#ad50e9770b73090d2f8f692e520d906813a3cefe"
+ integrity sha512-+09AwTbyLKyUwefiZSccgarp24okvH9A229NOVSpYTKWcxBxqZqdYmtQaJ8UET9mjPXRxP84vonJU4YMqCyBTQ==
+ dependencies:
+ chalk "2.4.2"
+ conventional-changelog "3.1.8"
+ conventional-changelog-config-spec "1.0.0"
+ conventional-recommended-bump "5.0.0"
+ detect-indent "6.0.0"
+ detect-newline "3.0.0"
+ dotgitignore "2.1.0"
+ figures "3.0.0"
+ find-up "3.0.0"
+ fs-access "1.0.1"
+ git-semver-tags "2.0.2"
+ semver "6.0.0"
+ stringify-package "1.0.0"
+ yargs "13.2.2"
static-extend@^0.1.1:
version "0.1.2"
- resolved "http://registry.npm.taobao.org/static-extend/download/static-extend-0.1.2.tgz#60809c39cbff55337226fd5e0b520f341f1fb5c6"
+ resolved "https://registry.yarnpkg.com/static-extend/-/static-extend-0.1.2.tgz#60809c39cbff55337226fd5e0b520f341f1fb5c6"
+ integrity sha1-YICcOcv/VTNyJv1eC1IPNB8ftcY=
dependencies:
define-property "^0.2.5"
object-copy "^0.1.0"
-"statuses@>= 1.3.1 < 2", "statuses@>= 1.4.0 < 2":
+"statuses@>= 1.4.0 < 2", "statuses@>= 1.5.0 < 2", statuses@~1.5.0:
version "1.5.0"
- resolved "http://registry.npm.taobao.org/statuses/download/statuses-1.5.0.tgz#161c7dac177659fd9811f43771fa99381478628c"
-
-statuses@~1.4.0:
- version "1.4.0"
- resolved "http://registry.npm.taobao.org/statuses/download/statuses-1.4.0.tgz#bb73d446da2796106efcc1b601a253d6c46bd087"
-
-stdout-stream@^1.4.0:
- version "1.4.0"
- resolved "http://registry.npm.taobao.org/stdout-stream/download/stdout-stream-1.4.0.tgz#a2c7c8587e54d9427ea9edb3ac3f2cd522df378b"
- dependencies:
- readable-stream "^2.0.1"
+ resolved "https://registry.yarnpkg.com/statuses/-/statuses-1.5.0.tgz#161c7dac177659fd9811f43771fa99381478628c"
+ integrity sha1-Fhx9rBd2Wf2YEfQ3cfqZOBR4Yow=
-stealthy-require@^1.1.0:
+stealthy-require@^1.1.1:
version "1.1.1"
- resolved "http://registry.npm.taobao.org/stealthy-require/download/stealthy-require-1.1.1.tgz#35b09875b4ff49f26a777e509b3090a3226bf24b"
+ resolved "https://registry.yarnpkg.com/stealthy-require/-/stealthy-require-1.1.1.tgz#35b09875b4ff49f26a777e509b3090a3226bf24b"
+ integrity sha1-NbCYdbT/SfJqd35QmzCQoyJr8ks=
stream-browserify@^2.0.1:
- version "2.0.1"
- resolved "http://registry.npm.taobao.org/stream-browserify/download/stream-browserify-2.0.1.tgz#66266ee5f9bdb9940a4e4514cafb43bb71e5c9db"
+ version "2.0.2"
+ resolved "https://registry.yarnpkg.com/stream-browserify/-/stream-browserify-2.0.2.tgz#87521d38a44aa7ee91ce1cd2a47df0cb49dd660b"
+ integrity sha512-nX6hmklHs/gr2FuxYDltq8fJA1GDlxKQCz8O/IM4atRqBH8OORmBNgfvW5gG10GT/qQ9u0CzIvr2X5Pkt6ntqg==
dependencies:
inherits "~2.0.1"
readable-stream "^2.0.2"
stream-each@^1.1.0:
- version "1.2.2"
- resolved "http://registry.npm.taobao.org/stream-each/download/stream-each-1.2.2.tgz#8e8c463f91da8991778765873fe4d960d8f616bd"
+ version "1.2.3"
+ resolved "https://registry.yarnpkg.com/stream-each/-/stream-each-1.2.3.tgz#ebe27a0c389b04fbcc233642952e10731afa9bae"
+ integrity sha512-vlMC2f8I2u/bZGqkdfLQW/13Zihpej/7PmSiMQsbYddxuTsJp8vRe2x2FvVExZg7FaOds43ROAuFJwPR4MTZLw==
dependencies:
end-of-stream "^1.1.0"
stream-shift "^1.0.0"
stream-http@^2.7.2:
- version "2.8.2"
- resolved "http://registry.npm.taobao.org/stream-http/download/stream-http-2.8.2.tgz#4126e8c6b107004465918aa2fc35549e77402c87"
+ version "2.8.3"
+ resolved "https://registry.yarnpkg.com/stream-http/-/stream-http-2.8.3.tgz#b2d242469288a5a27ec4fe8933acf623de6514fc"
+ integrity sha512-+TSkfINHDo4J+ZobQLWiMouQYB+UVYFttRA94FpEzzJ7ZdqcL4uUUQ7WkdkI4DSozGmgBUE/a47L+38PenXhUw==
dependencies:
builtin-status-codes "^3.0.0"
inherits "^2.0.1"
@@ -9214,26 +8644,26 @@ stream-http@^2.7.2:
stream-shift@^1.0.0:
version "1.0.0"
- resolved "http://registry.npm.taobao.org/stream-shift/download/stream-shift-1.0.0.tgz#d5c752825e5367e786f78e18e445ea223a155952"
+ resolved "https://registry.yarnpkg.com/stream-shift/-/stream-shift-1.0.0.tgz#d5c752825e5367e786f78e18e445ea223a155952"
+ integrity sha1-1cdSgl5TZ+eG944Y5EXqIjoVWVI=
strict-uri-encode@^1.0.0:
version "1.1.0"
- resolved "http://registry.npm.taobao.org/strict-uri-encode/download/strict-uri-encode-1.1.0.tgz#279b225df1d582b1f54e65addd4352e18faa0713"
-
-string-convert@^0.2.0:
- version "0.2.1"
- resolved "http://registry.npm.taobao.org/string-convert/download/string-convert-0.2.1.tgz#6982cc3049fbb4cd85f8b24568b9d9bf39eeff97"
+ resolved "https://registry.yarnpkg.com/strict-uri-encode/-/strict-uri-encode-1.1.0.tgz#279b225df1d582b1f54e65addd4352e18faa0713"
+ integrity sha1-J5siXfHVgrH1TmWt3UNS4Y+qBxM=
string-length@^2.0.0:
version "2.0.0"
- resolved "http://registry.npm.taobao.org/string-length/download/string-length-2.0.0.tgz#d40dbb686a3ace960c1cffca562bf2c45f8363ed"
+ resolved "https://registry.yarnpkg.com/string-length/-/string-length-2.0.0.tgz#d40dbb686a3ace960c1cffca562bf2c45f8363ed"
+ integrity sha1-1A27aGo6zpYMHP/KVivyxF+DY+0=
dependencies:
astral-regex "^1.0.0"
strip-ansi "^4.0.0"
-string-width@^1.0.1, string-width@^1.0.2:
+string-width@^1.0.1:
version "1.0.2"
- resolved "http://registry.npm.taobao.org/string-width/download/string-width-1.0.2.tgz#118bdf5b8cdc51a2a7e70d211e07e2b0b9b107d3"
+ resolved "https://registry.yarnpkg.com/string-width/-/string-width-1.0.2.tgz#118bdf5b8cdc51a2a7e70d211e07e2b0b9b107d3"
+ integrity sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=
dependencies:
code-point-at "^1.0.0"
is-fullwidth-code-point "^1.0.0"
@@ -9241,1164 +8671,1043 @@ string-width@^1.0.1, string-width@^1.0.2:
"string-width@^1.0.2 || 2", string-width@^2.0.0, string-width@^2.1.0, string-width@^2.1.1:
version "2.1.1"
- resolved "http://registry.npm.taobao.org/string-width/download/string-width-2.1.1.tgz#ab93f27a8dc13d28cac815c462143a6d9012ae9e"
+ resolved "https://registry.yarnpkg.com/string-width/-/string-width-2.1.1.tgz#ab93f27a8dc13d28cac815c462143a6d9012ae9e"
+ integrity sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==
dependencies:
is-fullwidth-code-point "^2.0.0"
strip-ansi "^4.0.0"
-string.prototype.repeat@^0.2.0:
- version "0.2.0"
- resolved "http://registry.npm.taobao.org/string.prototype.repeat/download/string.prototype.repeat-0.2.0.tgz#aba36de08dcee6a5a337d49b2ea1da1b28fc0ecf"
+string-width@^3.0.0, string-width@^3.1.0:
+ version "3.1.0"
+ resolved "https://registry.yarnpkg.com/string-width/-/string-width-3.1.0.tgz#22767be21b62af1081574306f69ac51b62203961"
+ integrity sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==
+ dependencies:
+ emoji-regex "^7.0.1"
+ is-fullwidth-code-point "^2.0.0"
+ strip-ansi "^5.1.0"
-string_decoder@^1.0.0, string_decoder@~1.1.1:
- version "1.1.1"
- resolved "http://registry.npm.taobao.org/string_decoder/download/string_decoder-1.1.1.tgz#9cf1611ba62685d7030ae9e4ba34149c3af03fc8"
+string_decoder@^1.0.0, string_decoder@^1.1.1:
+ version "1.2.0"
+ resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.2.0.tgz#fe86e738b19544afe70469243b2a1ee9240eae8d"
+ integrity sha512-6YqyX6ZWEYguAxgZzHGL7SsCeGx3V2TtOTqZz1xSTSWnqsbWwbptafNyvf/ACquZUXV3DANr5BDIwNYe1mN42w==
dependencies:
safe-buffer "~5.1.0"
-string_decoder@~0.10.x:
- version "0.10.31"
- resolved "http://registry.npm.taobao.org/string_decoder/download/string_decoder-0.10.31.tgz#62e203bc41766c6c28c9fc84301dab1c5310fa94"
+string_decoder@~1.1.1:
+ version "1.1.1"
+ resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.1.1.tgz#9cf1611ba62685d7030ae9e4ba34149c3af03fc8"
+ integrity sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==
+ dependencies:
+ safe-buffer "~5.1.0"
-stringstream@~0.0.4:
- version "0.0.6"
- resolved "http://registry.npm.taobao.org/stringstream/download/stringstream-0.0.6.tgz#7880225b0d4ad10e30927d167a1d6f2fd3b33a72"
[email protected]:
+ version "1.0.0"
+ resolved "https://registry.yarnpkg.com/stringify-package/-/stringify-package-1.0.0.tgz#e02828089333d7d45cd8c287c30aa9a13375081b"
+ integrity sha512-JIQqiWmLiEozOC0b0BtxZ/AOUtdUZHCBPgqIZ2kSJJqGwgb9neo44XdTHUC4HZSGqi03hOeB7W/E8rAlKnGe9g==
[email protected], strip-ansi@^3.0.0, strip-ansi@^3.0.1:
+strip-ansi@^3.0.0, strip-ansi@^3.0.1:
version "3.0.1"
- resolved "http://registry.npm.taobao.org/strip-ansi/download/strip-ansi-3.0.1.tgz#6a385fb8853d952d5ff05d0e8aaf94278dc63dcf"
+ resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-3.0.1.tgz#6a385fb8853d952d5ff05d0e8aaf94278dc63dcf"
+ integrity sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=
dependencies:
ansi-regex "^2.0.0"
strip-ansi@^4.0.0:
version "4.0.0"
- resolved "http://registry.npm.taobao.org/strip-ansi/download/strip-ansi-4.0.0.tgz#a8479022eb1ac368a871389b635262c505ee368f"
+ resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-4.0.0.tgz#a8479022eb1ac368a871389b635262c505ee368f"
+ integrity sha1-qEeQIusaw2iocTibY1JixQXuNo8=
dependencies:
ansi-regex "^3.0.0"
+strip-ansi@^5.0.0, strip-ansi@^5.1.0, strip-ansi@^5.2.0:
+ version "5.2.0"
+ resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-5.2.0.tgz#8c9a536feb6afc962bdfa5b104a5091c1ad9c0ae"
+ integrity sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==
+ dependencies:
+ ansi-regex "^4.1.0"
+
[email protected], strip-bom@^3.0.0:
version "3.0.0"
- resolved "http://registry.npm.taobao.org/strip-bom/download/strip-bom-3.0.0.tgz#2334c18e9c759f7bdd56fdef7e9ae3d588e68ed3"
+ resolved "https://registry.yarnpkg.com/strip-bom/-/strip-bom-3.0.0.tgz#2334c18e9c759f7bdd56fdef7e9ae3d588e68ed3"
+ integrity sha1-IzTBjpx1n3vdVv3vfprj1YjmjtM=
strip-bom@^2.0.0:
version "2.0.0"
- resolved "http://registry.npm.taobao.org/strip-bom/download/strip-bom-2.0.0.tgz#6219a85616520491f35788bdbf1447a99c7e6b0e"
+ resolved "https://registry.yarnpkg.com/strip-bom/-/strip-bom-2.0.0.tgz#6219a85616520491f35788bdbf1447a99c7e6b0e"
+ integrity sha1-YhmoVhZSBJHzV4i9vxRHqZx+aw4=
dependencies:
is-utf8 "^0.2.0"
strip-eof@^1.0.0:
version "1.0.0"
- resolved "http://registry.npm.taobao.org/strip-eof/download/strip-eof-1.0.0.tgz#bb43ff5598a6eb05d89b59fcd129c983313606bf"
+ resolved "https://registry.yarnpkg.com/strip-eof/-/strip-eof-1.0.0.tgz#bb43ff5598a6eb05d89b59fcd129c983313606bf"
+ integrity sha1-u0P/VZim6wXYm1n80SnJgzE2Br8=
strip-indent@^1.0.1:
version "1.0.1"
- resolved "http://registry.npm.taobao.org/strip-indent/download/strip-indent-1.0.1.tgz#0c7962a6adefa7bbd4ac366460a638552ae1a0a2"
+ resolved "https://registry.yarnpkg.com/strip-indent/-/strip-indent-1.0.1.tgz#0c7962a6adefa7bbd4ac366460a638552ae1a0a2"
+ integrity sha1-DHlipq3vp7vUrDZkYKY4VSrhoKI=
dependencies:
get-stdin "^4.0.1"
strip-indent@^2.0.0:
version "2.0.0"
- resolved "http://registry.npm.taobao.org/strip-indent/download/strip-indent-2.0.0.tgz#5ef8db295d01e6ed6cbf7aab96998d7822527b68"
+ resolved "https://registry.yarnpkg.com/strip-indent/-/strip-indent-2.0.0.tgz#5ef8db295d01e6ed6cbf7aab96998d7822527b68"
+ integrity sha1-XvjbKV0B5u1sv3qrlpmNeCJSe2g=
[email protected], strip-json-comments@^2.0.1, strip-json-comments@~2.0.1:
version "2.0.1"
- resolved "http://registry.npm.taobao.org/strip-json-comments/download/strip-json-comments-2.0.1.tgz#3c531942e908c2697c0ec344858c286c7ca0a60a"
+ resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-2.0.1.tgz#3c531942e908c2697c0ec344858c286c7ca0a60a"
+ integrity sha1-PFMZQukIwml8DsNEhYwobHygpgo=
[email protected]:
- version "0.20.3"
- resolved "http://registry.npm.taobao.org/style-loader/download/style-loader-0.20.3.tgz#ebef06b89dec491bcb1fdb3452e913a6fd1c10c4"
+style-loader@^0.23.1:
+ version "0.23.1"
+ resolved "https://registry.yarnpkg.com/style-loader/-/style-loader-0.23.1.tgz#cb9154606f3e771ab6c4ab637026a1049174d925"
+ integrity sha512-XK+uv9kWwhZMZ1y7mysB+zoihsEj4wneFWAS5qoiLwzW0WzSqMrrsIy+a3zkQJq0ipFtBpX5W3MqyRIBF/WFGg==
dependencies:
loader-utils "^1.1.0"
- schema-utils "^0.4.5"
-
-subarg@^1.0.0:
- version "1.0.0"
- resolved "http://registry.npm.taobao.org/subarg/download/subarg-1.0.0.tgz#f62cf17581e996b48fc965699f54c06ae268b8d2"
- dependencies:
- minimist "^1.1.0"
-
-supports-color@^2.0.0:
- version "2.0.0"
- resolved "http://registry.npm.taobao.org/supports-color/download/supports-color-2.0.0.tgz#535d045ce6b6363fa40117084629995e9df324c7"
-
-supports-color@^3.1.2, supports-color@^3.2.3:
- version "3.2.3"
- resolved "http://registry.npm.taobao.org/supports-color/download/supports-color-3.2.3.tgz#65ac0504b3954171d8a64946b2ae3cbb8a5f54f6"
- dependencies:
- has-flag "^1.0.0"
-
-supports-color@^4.2.1:
- version "4.5.0"
- resolved "http://registry.npm.taobao.org/supports-color/download/supports-color-4.5.0.tgz#be7a0de484dec5c5cddf8b3d59125044912f635b"
- dependencies:
- has-flag "^2.0.0"
+ schema-utils "^1.0.0"
-supports-color@^5.1.0, supports-color@^5.2.0, supports-color@^5.3.0, supports-color@^5.4.0:
- version "5.4.0"
- resolved "http://registry.npm.taobao.org/supports-color/download/supports-color-5.4.0.tgz#1c6b337402c2137605efe19f10fec390f6faab54"
[email protected], supports-color@^6.1.0:
+ version "6.1.0"
+ resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-6.1.0.tgz#0764abc69c63d5ac842dd4867e8d025e880df8f3"
+ integrity sha512-qe1jfm1Mg7Nq/NSh6XE24gPXROEVsWHxC1LIx//XNlD9iw7YZQGjZNjYN7xGaEG6iKdA8EtNFW6R0gjnVXp+wQ==
dependencies:
has-flag "^3.0.0"
-svgo@^0.7.0:
- version "0.7.2"
- resolved "http://registry.npm.taobao.org/svgo/download/svgo-0.7.2.tgz#9f5772413952135c6fefbf40afe6a4faa88b4bb5"
+supports-color@^5.2.0, supports-color@^5.3.0, supports-color@^5.5.0:
+ version "5.5.0"
+ resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-5.5.0.tgz#e2e69a44ac8772f78a1ec0b35b689df6530efc8f"
+ integrity sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==
dependencies:
- coa "~1.0.1"
- colors "~1.1.2"
- csso "~2.3.1"
- js-yaml "~3.7.0"
- mkdirp "~0.5.1"
- sax "~1.2.1"
- whet.extend "~0.9.9"
-
[email protected]:
- version "1.0.1"
- resolved "http://registry.npm.taobao.org/symbol-observable/download/symbol-observable-1.0.1.tgz#8340fc4702c3122df5d22288f88283f513d3fdd4"
-
-symbol-observable@^1.0.3:
- version "1.2.0"
- resolved "http://registry.npm.taobao.org/symbol-observable/download/symbol-observable-1.2.0.tgz#c22688aed4eab3cdc2dfeacbb561660560a00804"
+ has-flag "^3.0.0"
symbol-tree@^3.2.2:
- version "3.2.2"
- resolved "http://registry.npm.taobao.org/symbol-tree/download/symbol-tree-3.2.2.tgz#ae27db38f660a7ae2e1c3b7d1bc290819b8519e6"
+ version "3.2.4"
+ resolved "https://registry.yarnpkg.com/symbol-tree/-/symbol-tree-3.2.4.tgz#430637d248ba77e078883951fb9aa0eed7c63fa2"
+ integrity sha512-9QNk5KwDF+Bvz+PyObkmSYjI5ksVUYtjW7AU22r2NKcfLJcXp96hkDWU3+XndOsUb+AQ9QhfzfCT2O+CNWT5Tw==
-tapable@^0.2.7:
- version "0.2.8"
- resolved "http://registry.npm.taobao.org/tapable/download/tapable-0.2.8.tgz#99372a5c999bf2df160afc0d74bed4f47948cd22"
+table@^5.2.3:
+ version "5.4.1"
+ resolved "https://registry.yarnpkg.com/table/-/table-5.4.1.tgz#0691ae2ebe8259858efb63e550b6d5f9300171e8"
+ integrity sha512-E6CK1/pZe2N75rGZQotFOdmzWQ1AILtgYbMAbAjvms0S1l5IDB47zG3nCnFGB/w+7nB3vKofbLXCH7HPBo864w==
+ dependencies:
+ ajv "^6.9.1"
+ lodash "^4.17.11"
+ slice-ansi "^2.1.0"
+ string-width "^3.0.0"
-tapable@^1.0.0:
- version "1.0.0"
- resolved "http://registry.npm.taobao.org/tapable/download/tapable-1.0.0.tgz#cbb639d9002eed9c6b5975eb20598d7936f1f9f2"
+tapable@^1.0.0, tapable@^1.1.0:
+ version "1.1.3"
+ resolved "https://registry.yarnpkg.com/tapable/-/tapable-1.1.3.tgz#a1fccc06b58db61fd7a45da2da44f5f3a3e67ba2"
+ integrity sha512-4WK/bYZmj8xLr+HUCODHGF1ZFzsYffasLUgEiMBY4fgtltdO6B4WJtlSbPaDTLpYTcGVwM2qLnFTICEcNxs3kA==
tar-stream@^1.5.0:
- version "1.6.1"
- resolved "http://registry.npm.taobao.org/tar-stream/download/tar-stream-1.6.1.tgz#f84ef1696269d6223ca48f6e1eeede3f7e81f395"
+ version "1.6.2"
+ resolved "https://registry.yarnpkg.com/tar-stream/-/tar-stream-1.6.2.tgz#8ea55dab37972253d9a9af90fdcd559ae435c555"
+ integrity sha512-rzS0heiNf8Xn7/mpdSVVSMAWAoy9bfb1WOTYC78Z0UQKeKa/CWS8FOq0lKGNa8DWKAn9gxjCvMLYc5PGXYlK2A==
dependencies:
bl "^1.0.0"
- buffer-alloc "^1.1.0"
+ buffer-alloc "^1.2.0"
end-of-stream "^1.0.0"
fs-constants "^1.0.0"
readable-stream "^2.3.0"
- to-buffer "^1.1.0"
+ to-buffer "^1.1.1"
xtend "^4.0.0"
-tar@^2.0.0:
- version "2.2.1"
- resolved "http://registry.npm.taobao.org/tar/download/tar-2.2.1.tgz#8e4d2a256c0e2185c6b18ad694aec968b83cb1d1"
- dependencies:
- block-stream "*"
- fstream "^1.0.2"
- inherits "2"
-
tar@^4:
- version "4.4.4"
- resolved "http://registry.npm.taobao.org/tar/download/tar-4.4.4.tgz#ec8409fae9f665a4355cc3b4087d0820232bb8cd"
+ version "4.4.10"
+ resolved "https://registry.yarnpkg.com/tar/-/tar-4.4.10.tgz#946b2810b9a5e0b26140cf78bea6b0b0d689eba1"
+ integrity sha512-g2SVs5QIxvo6OLp0GudTqEf05maawKUxXru104iaayWA09551tFCTI8f1Asb4lPfkBr91k07iL4c11XO3/b0tA==
dependencies:
- chownr "^1.0.1"
+ chownr "^1.1.1"
fs-minipass "^1.2.5"
- minipass "^2.3.3"
- minizlib "^1.1.0"
+ minipass "^2.3.5"
+ minizlib "^1.2.1"
mkdirp "^0.5.0"
safe-buffer "^5.1.2"
- yallist "^3.0.2"
+ yallist "^3.0.3"
-test-exclude@^4.2.1:
- version "4.2.1"
- resolved "http://registry.npm.taobao.org/test-exclude/download/test-exclude-4.2.1.tgz#dfa222f03480bca69207ca728b37d74b45f724fa"
+terser-webpack-plugin@^1.1.0:
+ version "1.3.0"
+ resolved "https://registry.yarnpkg.com/terser-webpack-plugin/-/terser-webpack-plugin-1.3.0.tgz#69aa22426299f4b5b3775cbed8cb2c5d419aa1d4"
+ integrity sha512-W2YWmxPjjkUcOWa4pBEv4OP4er1aeQJlSo2UhtCFQCuRXEHjOFscO8VyWHj9JLlA0RzQb8Y2/Ta78XZvT54uGg==
dependencies:
- arrify "^1.0.1"
- micromatch "^3.1.8"
- object-assign "^4.1.0"
- read-pkg-up "^1.0.1"
- require-main-filename "^1.0.1"
+ cacache "^11.3.2"
+ find-cache-dir "^2.0.0"
+ is-wsl "^1.1.0"
+ loader-utils "^1.2.3"
+ schema-utils "^1.0.0"
+ serialize-javascript "^1.7.0"
+ source-map "^0.6.1"
+ terser "^4.0.0"
+ webpack-sources "^1.3.0"
+ worker-farm "^1.7.0"
+
+terser@^4.0.0:
+ version "4.0.2"
+ resolved "https://registry.yarnpkg.com/terser/-/terser-4.0.2.tgz#580cea06c4932f46a48ed13804c93bc93c275968"
+ integrity sha512-IWLuJqTvx97KP3uTYkFVn93cXO+EtlzJu8TdJylq+H0VBDlPMIfQA9MBS5Vc5t3xTEUG1q0hIfHMpAP2R+gWTw==
+ dependencies:
+ commander "^2.19.0"
+ source-map "~0.6.1"
+ source-map-support "~0.5.10"
-text-encoding@^0.6.4:
- version "0.6.4"
- resolved "http://registry.npm.taobao.org/text-encoding/download/text-encoding-0.6.4.tgz#e399a982257a276dae428bb92845cb71bdc26d19"
+test-exclude@^5.2.3:
+ version "5.2.3"
+ resolved "https://registry.yarnpkg.com/test-exclude/-/test-exclude-5.2.3.tgz#c3d3e1e311eb7ee405e092dac10aefd09091eac0"
+ integrity sha512-M+oxtseCFO3EDtAaGH7iiej3CBkzXqFMbzqYAACdzKui4eZA+pq3tZEwChvOdNfa7xxy8BfbmgJSIr43cC/+2g==
+ dependencies:
+ glob "^7.1.3"
+ minimatch "^3.0.4"
+ read-pkg-up "^4.0.0"
+ require-main-filename "^2.0.0"
text-extensions@^1.0.0:
- version "1.7.0"
- resolved "http://registry.npm.taobao.org/text-extensions/download/text-extensions-1.7.0.tgz#faaaba2625ed746d568a23e4d0aacd9bf08a8b39"
+ version "1.9.0"
+ resolved "https://registry.yarnpkg.com/text-extensions/-/text-extensions-1.9.0.tgz#1853e45fee39c945ce6f6c36b2d659b5aabc2a26"
+ integrity sha512-wiBrwC1EhBelW12Zy26JeOUkQ5mRu+5o8rpsJk5+2t+Y5vE7e842qtZDQ2g1NpX/29HdyFeJ4nSIhI47ENSxlQ==
+
+text-extensions@^2.0.0:
+ version "2.0.0"
+ resolved "https://registry.yarnpkg.com/text-extensions/-/text-extensions-2.0.0.tgz#43eabd1b495482fae4a2bf65e5f56c29f69220f6"
+ integrity sha512-F91ZqLgvi1E0PdvmxMgp+gcf6q8fMH7mhdwWfzXnl1k+GbpQDmi8l7DzLC5JTASKbwpY3TfxajAUzAXcv2NmsQ==
[email protected]:
+text-table@^0.2.0:
version "0.2.0"
- resolved "http://registry.npm.taobao.org/text-table/download/text-table-0.2.0.tgz#7f5ee823ae805207c00af2df4a84ec3fcfa570b4"
+ resolved "https://registry.yarnpkg.com/text-table/-/text-table-0.2.0.tgz#7f5ee823ae805207c00af2df4a84ec3fcfa570b4"
+ integrity sha1-f17oI66AUgfACvLfSoTsP8+lcLQ=
throat@^4.0.0:
version "4.1.0"
- resolved "http://registry.npm.taobao.org/throat/download/throat-4.1.0.tgz#89037cbc92c56ab18926e6ba4cbb200e15672a6a"
+ resolved "https://registry.yarnpkg.com/throat/-/throat-4.1.0.tgz#89037cbc92c56ab18926e6ba4cbb200e15672a6a"
+ integrity sha1-iQN8vJLFarGJJua6TLsgDhVnKmo=
through2@^2.0.0, through2@^2.0.2:
- version "2.0.3"
- resolved "http://registry.npm.taobao.org/through2/download/through2-2.0.3.tgz#0004569b37c7c74ba39c43f3ced78d1ad94140be"
+ version "2.0.5"
+ resolved "https://registry.yarnpkg.com/through2/-/through2-2.0.5.tgz#01c1e39eb31d07cb7d03a96a70823260b23132cd"
+ integrity sha512-/mrRod8xqpA+IHSLyGCQ2s8SPHiCDEeQJSep1jqLYeEUClOFG2Qsh+4FU6G9VeqpZnGW/Su8LQGc4YKni5rYSQ==
dependencies:
- readable-stream "^2.1.5"
+ readable-stream "~2.3.6"
xtend "~4.0.1"
-through@2, "through@>=2.2.7 <3", through@^2.3.6:
+through2@^3.0.0:
+ version "3.0.1"
+ resolved "https://registry.yarnpkg.com/through2/-/through2-3.0.1.tgz#39276e713c3302edf9e388dd9c812dd3b825bd5a"
+ integrity sha512-M96dvTalPT3YbYLaKaCuwu+j06D/8Jfib0o/PxbVt6Amhv3dUAtW6rTV1jPgJSBG83I/e04Y6xkVdVhSRhi0ww==
+ dependencies:
+ readable-stream "2 || 3"
+
+through@2, "through@>=2.2.7 <3", through@^2.3.6, through@~2.3.6:
version "2.3.8"
- resolved "http://registry.npm.taobao.org/through/download/through-2.3.8.tgz#0dd4c9ffaabc357960b1b724115d7e0e86a2e1f5"
+ resolved "https://registry.yarnpkg.com/through/-/through-2.3.8.tgz#0dd4c9ffaabc357960b1b724115d7e0e86a2e1f5"
+ integrity sha1-DdTJ/6q8NXlgsbckEV1+Doai4fU=
thunky@^1.0.2:
- version "1.0.2"
- resolved "http://registry.npm.taobao.org/thunky/download/thunky-1.0.2.tgz#a862e018e3fb1ea2ec3fce5d55605cf57f247371"
-
-time-stamp@^2.0.0:
- version "2.0.0"
- resolved "http://registry.npm.taobao.org/time-stamp/download/time-stamp-2.0.0.tgz#95c6a44530e15ba8d6f4a3ecb8c3a3fac46da357"
+ version "1.0.3"
+ resolved "https://registry.yarnpkg.com/thunky/-/thunky-1.0.3.tgz#f5df732453407b09191dae73e2a8cc73f381a826"
+ integrity sha512-YwT8pjmNcAXBZqrubu22P4FYsh2D4dxRmnWBOL8Jk8bUcRUtc5326kx32tuTmFDAZtLOGEVNl8POAR8j896Iow==
timers-browserify@^2.0.4:
version "2.0.10"
- resolved "http://registry.npm.taobao.org/timers-browserify/download/timers-browserify-2.0.10.tgz#1d28e3d2aadf1d5a5996c4e9f95601cd053480ae"
+ resolved "https://registry.yarnpkg.com/timers-browserify/-/timers-browserify-2.0.10.tgz#1d28e3d2aadf1d5a5996c4e9f95601cd053480ae"
+ integrity sha512-YvC1SV1XdOUaL6gx5CoGroT3Gu49pK9+TZ38ErPldOWW4j49GI1HKs9DV+KGq/w6y+LZ72W1c8cKz2vzY+qpzg==
dependencies:
setimmediate "^1.0.4"
-tmp@^0.0.29:
- version "0.0.29"
- resolved "http://registry.npm.taobao.org/tmp/download/tmp-0.0.29.tgz#f25125ff0dd9da3ccb0c2dd371ee1288bb9128c0"
- dependencies:
- os-tmpdir "~1.0.1"
-
tmp@^0.0.33:
version "0.0.33"
- resolved "http://registry.npm.taobao.org/tmp/download/tmp-0.0.33.tgz#6d34335889768d21b2bcda0aa277ced3b1bfadf9"
+ resolved "https://registry.yarnpkg.com/tmp/-/tmp-0.0.33.tgz#6d34335889768d21b2bcda0aa277ced3b1bfadf9"
+ integrity sha512-jRCJlojKnZ3addtTOjdIqoRuPEKBvNXcGYqzO6zWZX8KfKEpnGY5jfggJQ3EjKuu8D4bJRr0y+cYJFmYbImXGw==
dependencies:
os-tmpdir "~1.0.2"
[email protected]:
version "1.0.4"
- resolved "http://registry.npm.taobao.org/tmpl/download/tmpl-1.0.4.tgz#23640dd7b42d00433911140820e5cf440e521dd1"
+ resolved "https://registry.yarnpkg.com/tmpl/-/tmpl-1.0.4.tgz#23640dd7b42d00433911140820e5cf440e521dd1"
+ integrity sha1-I2QN17QtAEM5ERQIIOXPRA5SHdE=
to-arraybuffer@^1.0.0:
version "1.0.1"
- resolved "http://registry.npm.taobao.org/to-arraybuffer/download/to-arraybuffer-1.0.1.tgz#7d229b1fcc637e466ca081180836a7aabff83f43"
+ resolved "https://registry.yarnpkg.com/to-arraybuffer/-/to-arraybuffer-1.0.1.tgz#7d229b1fcc637e466ca081180836a7aabff83f43"
+ integrity sha1-fSKbH8xjfkZsoIEYCDanqr/4P0M=
-to-buffer@^1.1.0:
+to-buffer@^1.1.1:
version "1.1.1"
- resolved "http://registry.npm.taobao.org/to-buffer/download/to-buffer-1.1.1.tgz#493bd48f62d7c43fcded313a03dcadb2e1213a80"
-
-to-fast-properties@^1.0.3:
- version "1.0.3"
- resolved "http://registry.npm.taobao.org/to-fast-properties/download/to-fast-properties-1.0.3.tgz#b83571fa4d8c25b82e231b06e3a3055de4ca1a47"
+ resolved "https://registry.yarnpkg.com/to-buffer/-/to-buffer-1.1.1.tgz#493bd48f62d7c43fcded313a03dcadb2e1213a80"
+ integrity sha512-lx9B5iv7msuFYE3dytT+KE5tap+rNYw+K4jVkb9R/asAb+pbBSM17jtunHplhBe6RRJdZx3Pn2Jph24O32mOVg==
to-fast-properties@^2.0.0:
version "2.0.0"
- resolved "http://registry.npm.taobao.org/to-fast-properties/download/to-fast-properties-2.0.0.tgz#dc5e698cbd079265bc73e0377681a4e4e83f616e"
+ resolved "https://registry.yarnpkg.com/to-fast-properties/-/to-fast-properties-2.0.0.tgz#dc5e698cbd079265bc73e0377681a4e4e83f616e"
+ integrity sha1-3F5pjL0HkmW8c+A3doGk5Og/YW4=
to-object-path@^0.3.0:
version "0.3.0"
- resolved "http://registry.npm.taobao.org/to-object-path/download/to-object-path-0.3.0.tgz#297588b7b0e7e0ac08e04e672f85c1f4999e17af"
+ resolved "https://registry.yarnpkg.com/to-object-path/-/to-object-path-0.3.0.tgz#297588b7b0e7e0ac08e04e672f85c1f4999e17af"
+ integrity sha1-KXWIt7Dn4KwI4E5nL4XB9JmeF68=
dependencies:
kind-of "^3.0.2"
to-regex-range@^2.1.0:
version "2.1.1"
- resolved "http://registry.npm.taobao.org/to-regex-range/download/to-regex-range-2.1.1.tgz#7c80c17b9dfebe599e27367e0d4dd5590141db38"
+ resolved "https://registry.yarnpkg.com/to-regex-range/-/to-regex-range-2.1.1.tgz#7c80c17b9dfebe599e27367e0d4dd5590141db38"
+ integrity sha1-fIDBe53+vlmeJzZ+DU3VWQFB2zg=
dependencies:
is-number "^3.0.0"
repeat-string "^1.6.1"
+to-regex-range@^5.0.1:
+ version "5.0.1"
+ resolved "https://registry.yarnpkg.com/to-regex-range/-/to-regex-range-5.0.1.tgz#1648c44aae7c8d988a326018ed72f5b4dd0392e4"
+ integrity sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==
+ dependencies:
+ is-number "^7.0.0"
+
to-regex@^3.0.1, to-regex@^3.0.2:
version "3.0.2"
- resolved "http://registry.npm.taobao.org/to-regex/download/to-regex-3.0.2.tgz#13cfdd9b336552f30b51f33a8ae1b42a7a7599ce"
+ resolved "https://registry.yarnpkg.com/to-regex/-/to-regex-3.0.2.tgz#13cfdd9b336552f30b51f33a8ae1b42a7a7599ce"
+ integrity sha512-FWtleNAtZ/Ki2qtqej2CXTOayOH9bHDQF+Q48VpWyDXjbYxA4Yz8iDB31zXOBUlOHHKidDbqGVrTUvQMPmBGBw==
dependencies:
define-property "^2.0.2"
extend-shallow "^3.0.2"
regex-not "^1.0.2"
safe-regex "^1.1.0"
-toposort@^1.0.0:
- version "1.0.7"
- resolved "http://registry.npm.taobao.org/toposort/download/toposort-1.0.7.tgz#2e68442d9f64ec720b8cc89e6443ac6caa950029"
[email protected]:
+ version "1.0.0"
+ resolved "https://registry.yarnpkg.com/toidentifier/-/toidentifier-1.0.0.tgz#7e1be3470f1e77948bc43d94a3c8f4d7752ba553"
+ integrity sha512-yaOH/Pk/VEhBWWTlhI+qXxDFXlejDGcQipMlyxda9nthulaxLZUNcUqFxokp0vcYnvteJln5FNQDRrxj3YcbVw==
+
+tough-cookie@^2.3.3, tough-cookie@^2.3.4:
+ version "2.5.0"
+ resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-2.5.0.tgz#cd9fb2a0aa1d5a12b473bd9fb96fa3dcff65ade2"
+ integrity sha512-nlLsUzgm1kfLXSXfRZMc1KLAugd4hqJHDTvc2hDIwS3mZAfMEuMbc03SujMF+GEcpaX/qboeycw6iO8JwVv2+g==
+ dependencies:
+ psl "^1.1.28"
+ punycode "^2.1.1"
-tough-cookie@>=2.3.3, tough-cookie@^2.3.3, tough-cookie@~2.3.0, tough-cookie@~2.3.3:
- version "2.3.4"
- resolved "http://registry.npm.taobao.org/tough-cookie/download/tough-cookie-2.3.4.tgz#ec60cee38ac675063ffc97a5c18970578ee83655"
+tough-cookie@~2.4.3:
+ version "2.4.3"
+ resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-2.4.3.tgz#53f36da3f47783b0925afa06ff9f3b165280f781"
+ integrity sha512-Q5srk/4vDM54WJsJio3XNn6K2sCG+CQ8G5Wz6bZhRZoAe/+TxjWB/GlFAnYEbkYVlON9FMk/fE3h2RLpPXo4lQ==
dependencies:
+ psl "^1.1.24"
punycode "^1.4.1"
tr46@^1.0.1:
version "1.0.1"
- resolved "http://registry.npm.taobao.org/tr46/download/tr46-1.0.1.tgz#a8b13fd6bfd2489519674ccde55ba3693b706d09"
+ resolved "https://registry.yarnpkg.com/tr46/-/tr46-1.0.1.tgz#a8b13fd6bfd2489519674ccde55ba3693b706d09"
+ integrity sha1-qLE/1r/SSJUZZ0zN5VujaTtwbQk=
dependencies:
punycode "^2.1.0"
trim-newlines@^1.0.0:
version "1.0.0"
- resolved "http://registry.npm.taobao.org/trim-newlines/download/trim-newlines-1.0.0.tgz#5887966bb582a4503a41eb524f7d35011815a613"
+ resolved "https://registry.yarnpkg.com/trim-newlines/-/trim-newlines-1.0.0.tgz#5887966bb582a4503a41eb524f7d35011815a613"
+ integrity sha1-WIeWa7WCpFA6QetST301ARgVphM=
trim-newlines@^2.0.0:
version "2.0.0"
- resolved "http://registry.npm.taobao.org/trim-newlines/download/trim-newlines-2.0.0.tgz#b403d0b91be50c331dfc4b82eeceb22c3de16d20"
+ resolved "https://registry.yarnpkg.com/trim-newlines/-/trim-newlines-2.0.0.tgz#b403d0b91be50c331dfc4b82eeceb22c3de16d20"
+ integrity sha1-tAPQuRvlDDMd/EuC7s6yLD3hbSA=
trim-off-newlines@^1.0.0:
version "1.0.1"
- resolved "http://registry.npm.taobao.org/trim-off-newlines/download/trim-off-newlines-1.0.1.tgz#9f9ba9d9efa8764c387698bcbfeb2c848f11adb3"
+ resolved "https://registry.yarnpkg.com/trim-off-newlines/-/trim-off-newlines-1.0.1.tgz#9f9ba9d9efa8764c387698bcbfeb2c848f11adb3"
+ integrity sha1-n5up2e+odkw4dpi8v+sshI8RrbM=
trim-right@^1.0.1:
version "1.0.1"
- resolved "http://registry.npm.taobao.org/trim-right/download/trim-right-1.0.1.tgz#cb2e1203067e0c8de1f614094b9fe45704ea6003"
-
-"true-case-path@^1.0.2":
- version "1.0.2"
- resolved "http://registry.npm.taobao.org/true-case-path/download/true-case-path-1.0.2.tgz#7ec91130924766c7f573be3020c34f8fdfd00d62"
- dependencies:
- glob "^6.0.4"
-
-tryer@^1.0.0:
- version "1.0.0"
- resolved "http://registry.npm.taobao.org/tryer/download/tryer-1.0.0.tgz#027b69fa823225e551cace3ef03b11f6ab37c1d7"
-
-ts-import-plugin@^1.5.0:
- version "1.5.0"
- resolved "http://registry.npm.taobao.org/ts-import-plugin/download/ts-import-plugin-1.5.0.tgz#6fe820337fcadd28dede0250098a8549c510a492"
- dependencies:
- tslib "^1.9.0"
-
-ts-jest@^22.4.3:
- version "22.4.6"
- resolved "http://registry.npm.taobao.org/ts-jest/download/ts-jest-22.4.6.tgz#a5d7f5e8b809626d1f4143209d301287472ec344"
- dependencies:
- babel-core "^6.26.3"
- babel-plugin-istanbul "^4.1.6"
- babel-plugin-transform-es2015-modules-commonjs "^6.26.2"
- babel-preset-jest "^22.4.3"
- cpx "^1.5.0"
- fs-extra "6.0.0"
- jest-config "^22.4.3"
- lodash "^4.17.10"
- pkg-dir "^2.0.0"
- source-map-support "^0.5.5"
- yargs "^11.0.0"
-
-ts-lint@^4.5.1:
- version "4.5.1"
- resolved "http://registry.npm.taobao.org/ts-lint/download/ts-lint-4.5.1.tgz#9c22b7b7b862b67324dd1bd213a845c03a7fb8c0"
- dependencies:
- babel-code-frame "^6.20.0"
- colors "^1.1.2"
- diff "^3.0.1"
- findup-sync "~0.3.0"
- glob "^7.1.1"
- optimist "~0.6.0"
- resolve "^1.1.7"
- tsutils "^1.1.0"
-
-ts-loader@^3.2.0:
- version "3.5.0"
- resolved "http://registry.npm.taobao.org/ts-loader/download/ts-loader-3.5.0.tgz#151d004dcddb4cf8e381a3bf9d6b74c2d957a9c0"
- dependencies:
- chalk "^2.3.0"
- enhanced-resolve "^3.0.0"
- loader-utils "^1.0.2"
- micromatch "^3.1.4"
- semver "^5.0.1"
-
-tsconfig-paths-webpack-plugin@^3.0.3:
- version "3.1.3"
- resolved "http://registry.npm.taobao.org/tsconfig-paths-webpack-plugin/download/tsconfig-paths-webpack-plugin-3.1.3.tgz#1b5e146f0106817cda34f3b1a25365c0bcf8a9c2"
- dependencies:
- chalk "^2.3.0"
- tsconfig-paths "^3.2.0"
-
-tsconfig-paths@^3.2.0:
- version "3.3.2"
- resolved "http://registry.npm.taobao.org/tsconfig-paths/download/tsconfig-paths-3.3.2.tgz#bb48b845e221a44387be0f9968ee6c37c2a37c4d"
- dependencies:
- deepmerge "^2.0.1"
- minimist "^1.2.0"
- strip-bom "^3.0.0"
- strip-json-comments "^2.0.1"
-
-tslib@^1.0.0, tslib@^1.8.0, tslib@^1.8.1, tslib@^1.9.0:
- version "1.9.1"
- resolved "http://registry.npm.taobao.org/tslib/download/tslib-1.9.1.tgz#a5d1f0532a49221c87755cfcc89ca37197242ba7"
-
-tslint-config-standard@^7.0.0:
- version "7.0.0"
- resolved "http://registry.npm.taobao.org/tslint-config-standard/download/tslint-config-standard-7.0.0.tgz#47bbf25578ed2212456f892d51e1abe884a29f15"
- dependencies:
- tslint-eslint-rules "^4.1.1"
-
-tslint-eslint-rules@^4.1.1:
- version "4.1.1"
- resolved "http://registry.npm.taobao.org/tslint-eslint-rules/download/tslint-eslint-rules-4.1.1.tgz#7c30e7882f26bc276bff91d2384975c69daf88ba"
- dependencies:
- doctrine "^0.7.2"
- tslib "^1.0.0"
- tsutils "^1.4.0"
+ resolved "https://registry.yarnpkg.com/trim-right/-/trim-right-1.0.1.tgz#cb2e1203067e0c8de1f614094b9fe45704ea6003"
+ integrity sha1-yy4SAwZ+DI3h9hQJS5/kVwTqYAM=
-tslint@^5.9.1:
- version "5.10.0"
- resolved "http://registry.npm.taobao.org/tslint/download/tslint-5.10.0.tgz#11e26bccb88afa02dd0d9956cae3d4540b5f54c3"
- dependencies:
- babel-code-frame "^6.22.0"
- builtin-modules "^1.1.1"
- chalk "^2.3.0"
- commander "^2.12.1"
- diff "^3.2.0"
- glob "^7.1.1"
- js-yaml "^3.7.0"
- minimatch "^3.0.4"
- resolve "^1.3.2"
- semver "^5.3.0"
- tslib "^1.8.0"
- tsutils "^2.12.1"
-
-tsutils@^1.1.0, tsutils@^1.4.0:
- version "1.9.1"
- resolved "http://registry.npm.taobao.org/tsutils/download/tsutils-1.9.1.tgz#b9f9ab44e55af9681831d5f28d0aeeaf5c750cb0"
+tslib@^1.8.1, tslib@^1.9.0:
+ version "1.10.0"
+ resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.10.0.tgz#c3c19f95973fb0a62973fb09d90d961ee43e5c8a"
+ integrity sha512-qOebF53frne81cf0S9B41ByenJ3/IuH8yJKngAX35CmiZySA0khhkovshKK+jGCaMnVomla7gVlIcc3EvKPbTQ==
-tsutils@^2.12.1:
- version "2.27.1"
- resolved "http://registry.npm.taobao.org/tsutils/download/tsutils-2.27.1.tgz#ab0276ac23664f36ce8fd4414daec4aebf4373ee"
+tsutils@^3.7.0:
+ version "3.14.0"
+ resolved "https://registry.yarnpkg.com/tsutils/-/tsutils-3.14.0.tgz#bf8d5a7bae5369331fa0f2b0a5a10bd7f7396c77"
+ integrity sha512-SmzGbB0l+8I0QwsPgjooFRaRvHLBLNYM8SeQ0k6rtNDru5sCGeLJcZdwilNndN+GysuFjF5EIYgN8GfFG6UeUw==
dependencies:
tslib "^1.8.1"
[email protected]:
version "0.0.0"
- resolved "http://registry.npm.taobao.org/tty-browserify/download/tty-browserify-0.0.0.tgz#a157ba402da24e9bf957f9aa69d524eed42901a6"
+ resolved "https://registry.yarnpkg.com/tty-browserify/-/tty-browserify-0.0.0.tgz#a157ba402da24e9bf957f9aa69d524eed42901a6"
+ integrity sha1-oVe6QC2iTpv5V/mqadUk7tQpAaY=
tunnel-agent@^0.6.0:
version "0.6.0"
- resolved "http://registry.npm.taobao.org/tunnel-agent/download/tunnel-agent-0.6.0.tgz#27a5dea06b36b04a0a9966774b290868f0fc40fd"
+ resolved "https://registry.yarnpkg.com/tunnel-agent/-/tunnel-agent-0.6.0.tgz#27a5dea06b36b04a0a9966774b290868f0fc40fd"
+ integrity sha1-J6XeoGs2sEoKmWZ3SykIaPD8QP0=
dependencies:
safe-buffer "^5.0.1"
-tunnel-agent@~0.4.1:
- version "0.4.3"
- resolved "http://registry.npm.taobao.org/tunnel-agent/download/tunnel-agent-0.4.3.tgz#6373db76909fe570e08d73583365ed828a74eeeb"
-
tweetnacl@^0.14.3, tweetnacl@~0.14.0:
version "0.14.5"
- resolved "http://registry.npm.taobao.org/tweetnacl/download/tweetnacl-0.14.5.tgz#5ae68177f192d4456269d108afa93ff8743f4f64"
+ resolved "https://registry.yarnpkg.com/tweetnacl/-/tweetnacl-0.14.5.tgz#5ae68177f192d4456269d108afa93ff8743f4f64"
+ integrity sha1-WuaBd/GS1EViadEIr6k/+HQ/T2Q=
type-check@~0.3.2:
version "0.3.2"
- resolved "http://registry.npm.taobao.org/type-check/download/type-check-0.3.2.tgz#5884cab512cf1d355e3fb784f30804b2b520db72"
+ resolved "https://registry.yarnpkg.com/type-check/-/type-check-0.3.2.tgz#5884cab512cf1d355e3fb784f30804b2b520db72"
+ integrity sha1-WITKtRLPHTVeP7eE8wgEsrUg23I=
dependencies:
prelude-ls "~1.1.2"
-type-detect@^4.0.5:
[email protected]:
version "4.0.8"
- resolved "http://registry.npm.taobao.org/type-detect/download/type-detect-4.0.8.tgz#7646fb5f18871cfbb7749e69bd39a6388eb7450c"
+ resolved "https://registry.yarnpkg.com/type-detect/-/type-detect-4.0.8.tgz#7646fb5f18871cfbb7749e69bd39a6388eb7450c"
+ integrity sha512-0fr/mIH1dlO+x7TlcMy+bIDqKPsw/70tVyeHW787goQjhmqaZe10uwLujubK9q9Lg6Fiho1KUKDYz0Z7k7g5/g==
+
+type-fest@^0.4.1:
+ version "0.4.1"
+ resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.4.1.tgz#8bdf77743385d8a4f13ba95f610f5ccd68c728f8"
+ integrity sha512-IwzA/LSfD2vC1/YDYMv/zHP4rDF1usCwllsDpbolT3D4fUepIO7f9K70jjmUewU/LmGUKJcwcVtDCpnKk4BPMw==
-type-is@~1.6.15, type-is@~1.6.16:
- version "1.6.16"
- resolved "http://registry.npm.taobao.org/type-is/download/type-is-1.6.16.tgz#f89ce341541c672b25ee7ae3c73dee3b2be50194"
+type-is@~1.6.17, type-is@~1.6.18:
+ version "1.6.18"
+ resolved "https://registry.yarnpkg.com/type-is/-/type-is-1.6.18.tgz#4e552cd05df09467dcbc4ef739de89f2cf37c131"
+ integrity sha512-TkRKr9sUTxEH8MdfuCSP7VizJyzRNMjj2J2do2Jr3Kym598JVdEksuzPQCnlFPW4ky9Q+iA+ma9BGm06XQBy8g==
dependencies:
media-typer "0.3.0"
- mime-types "~2.1.18"
+ mime-types "~2.1.24"
typedarray@^0.0.6:
version "0.0.6"
- resolved "http://registry.npm.taobao.org/typedarray/download/typedarray-0.0.6.tgz#867ac74e3864187b1d3d47d996a78ec5c8830777"
-
-typescript@^2.8.1:
- version "2.8.3"
- resolved "http://registry.npm.taobao.org/typescript/download/typescript-2.8.3.tgz#5d817f9b6f31bb871835f4edf0089f21abe6c170"
-
-ua-parser-js@^0.7.18, ua-parser-js@^0.7.19:
- version "0.7.19"
- resolved "http://registry.npm.taobao.org/ua-parser-js/download/ua-parser-js-0.7.19.tgz#94151be4c0a7fb1d001af7022fdaca4642659e4b"
- integrity sha1-lBUb5MCn+x0AGvcCL9rKRkJlnks=
+ resolved "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz#867ac74e3864187b1d3d47d996a78ec5c8830777"
+ integrity sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c=
-ua-parser-js@^0.7.9:
- version "0.7.18"
- resolved "http://registry.npm.taobao.org/ua-parser-js/download/ua-parser-js-0.7.18.tgz#a7bfd92f56edfb117083b69e31d2aa8882d4b1ed"
+typescript@^3.5.2:
+ version "3.5.2"
+ resolved "https://registry.yarnpkg.com/typescript/-/typescript-3.5.2.tgz#a09e1dc69bc9551cadf17dba10ee42cf55e5d56c"
+ integrity sha512-7KxJovlYhTX5RaRbUdkAXN1KUZ8PwWlTzQdHV6xNqvuFOs7+WBo10TQUqT19Q/Jz2hk5v9TQDIhyLhhJY4p5AA==
-uglify-es@^3.3.4:
- version "3.3.9"
- resolved "http://registry.npm.taobao.org/uglify-es/download/uglify-es-3.3.9.tgz#0c1c4f0700bed8dbc124cdb304d2592ca203e677"
[email protected]:
+ version "3.4.10"
+ resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-3.4.10.tgz#9ad9563d8eb3acdfb8d38597d2af1d815f6a755f"
+ integrity sha512-Y2VsbPVs0FIshJztycsO2SfPk7/KAF/T72qzv9u5EpQ4kB2hQoHlhNQTsNyy6ul7lQtqJN/AoWeS23OzEiEFxw==
dependencies:
- commander "~2.13.0"
+ commander "~2.19.0"
source-map "~0.6.1"
[email protected]:
- version "3.3.27"
- resolved "http://registry.npm.taobao.org/uglify-js/download/uglify-js-3.3.27.tgz#eb8c3c9429969f86ff5b0a2422ffc78c3cea8cc0"
+uglify-js@^3.1.4:
+ version "3.6.0"
+ resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-3.6.0.tgz#704681345c53a8b2079fb6cec294b05ead242ff5"
+ integrity sha512-W+jrUHJr3DXKhrsS7NUVxn3zqMOFn0hL/Ei6v0anCIMoKC93TjcflTagwIHLW7SfMFfiQuktQyFVCFHGUE0+yg==
dependencies:
- commander "~2.15.0"
+ commander "~2.20.0"
source-map "~0.6.1"
-uglify-js@^2.6, uglify-js@^2.8.29:
- version "2.8.29"
- resolved "http://registry.npm.taobao.org/uglify-js/download/uglify-js-2.8.29.tgz#29c5733148057bb4e1f75df35b7a9cb72e6a59dd"
- dependencies:
- source-map "~0.5.1"
- yargs "~3.10.0"
- optionalDependencies:
- uglify-to-browserify "~1.0.0"
-
-uglify-to-browserify@~1.0.0:
- version "1.0.2"
- resolved "http://registry.npm.taobao.org/uglify-to-browserify/download/uglify-to-browserify-1.0.2.tgz#6e0924d6bda6b5afe349e39a6d632850a0f882b7"
+unicode-canonical-property-names-ecmascript@^1.0.4:
+ version "1.0.4"
+ resolved "https://registry.yarnpkg.com/unicode-canonical-property-names-ecmascript/-/unicode-canonical-property-names-ecmascript-1.0.4.tgz#2619800c4c825800efdd8343af7dd9933cbe2818"
+ integrity sha512-jDrNnXWHd4oHiTZnx/ZG7gtUTVp+gCcTTKr8L0HjlwphROEW3+Him+IpvC+xcJEFegapiMZyZe02CyuOnRmbnQ==
-uglifyjs-webpack-plugin@^0.4.6:
- version "0.4.6"
- resolved "http://registry.npm.taobao.org/uglifyjs-webpack-plugin/download/uglifyjs-webpack-plugin-0.4.6.tgz#b951f4abb6bd617e66f63eb891498e391763e309"
+unicode-match-property-ecmascript@^1.0.4:
+ version "1.0.4"
+ resolved "https://registry.yarnpkg.com/unicode-match-property-ecmascript/-/unicode-match-property-ecmascript-1.0.4.tgz#8ed2a32569961bce9227d09cd3ffbb8fed5f020c"
+ integrity sha512-L4Qoh15vTfntsn4P1zqnHulG0LdXgjSO035fEpdtp6YxXhMT51Q6vgM5lYdG/5X3MjS+k/Y9Xw4SFCY9IkR0rg==
dependencies:
- source-map "^0.5.6"
- uglify-js "^2.8.29"
- webpack-sources "^1.0.1"
+ unicode-canonical-property-names-ecmascript "^1.0.4"
+ unicode-property-aliases-ecmascript "^1.0.4"
-uglifyjs-webpack-plugin@^1.2.5:
- version "1.2.5"
- resolved "http://registry.npm.taobao.org/uglifyjs-webpack-plugin/download/uglifyjs-webpack-plugin-1.2.5.tgz#2ef8387c8f1a903ec5e44fa36f9f3cbdcea67641"
- dependencies:
- cacache "^10.0.4"
- find-cache-dir "^1.0.0"
- schema-utils "^0.4.5"
- serialize-javascript "^1.4.0"
- source-map "^0.6.1"
- uglify-es "^3.3.4"
- webpack-sources "^1.1.0"
- worker-farm "^1.5.2"
+unicode-match-property-value-ecmascript@^1.1.0:
+ version "1.1.0"
+ resolved "https://registry.yarnpkg.com/unicode-match-property-value-ecmascript/-/unicode-match-property-value-ecmascript-1.1.0.tgz#5b4b426e08d13a80365e0d657ac7a6c1ec46a277"
+ integrity sha512-hDTHvaBk3RmFzvSl0UVrUmC3PuW9wKVnpoUDYH0JDkSIovzw+J5viQmeYHxVSBptubnr7PbH2e0fnpDRQnQl5g==
-underscore@~1.4.4:
- version "1.4.4"
- resolved "http://registry.npm.taobao.org/underscore/download/underscore-1.4.4.tgz#61a6a32010622afa07963bf325203cf12239d604"
+unicode-property-aliases-ecmascript@^1.0.4:
+ version "1.0.5"
+ resolved "https://registry.yarnpkg.com/unicode-property-aliases-ecmascript/-/unicode-property-aliases-ecmascript-1.0.5.tgz#a9cc6cc7ce63a0a3023fc99e341b94431d405a57"
+ integrity sha512-L5RAqCfXqAwR3RriF8pM0lU0w4Ryf/GgzONwi6KnL1taJQa7x1TCxdJnILX59WIGOwR57IVxn7Nej0fz1Ny6fw==
union-value@^1.0.0:
- version "1.0.0"
- resolved "http://registry.npm.taobao.org/union-value/download/union-value-1.0.0.tgz#5c71c34cb5bad5dcebe3ea0cd08207ba5aa1aea4"
+ version "1.0.1"
+ resolved "https://registry.yarnpkg.com/union-value/-/union-value-1.0.1.tgz#0b6fe7b835aecda61c6ea4d4f02c14221e109847"
+ integrity sha512-tJfXmxMeWYnczCVs7XAEvIV7ieppALdyepWMkHkwciRpZraG/xwT+s2JN8+pr1+8jCRf80FFzvr+MpQeeoF4Xg==
dependencies:
arr-union "^3.1.0"
get-value "^2.0.6"
is-extendable "^0.1.1"
- set-value "^0.4.3"
+ set-value "^2.0.1"
uniq@^1.0.1:
version "1.0.1"
- resolved "http://registry.npm.taobao.org/uniq/download/uniq-1.0.1.tgz#b31c5ae8254844a3a8281541ce2b04b865a734ff"
-
-uniqs@^2.0.0:
- version "2.0.0"
- resolved "http://registry.npm.taobao.org/uniqs/download/uniqs-2.0.0.tgz#ffede4b36b25290696e6e165d4a59edb998e6b02"
+ resolved "https://registry.yarnpkg.com/uniq/-/uniq-1.0.1.tgz#b31c5ae8254844a3a8281541ce2b04b865a734ff"
+ integrity sha1-sxxa6CVIRKOoKBVBzisEuGWnNP8=
-unique-filename@^1.1.0:
- version "1.1.0"
- resolved "http://registry.npm.taobao.org/unique-filename/download/unique-filename-1.1.0.tgz#d05f2fe4032560871f30e93cbe735eea201514f3"
+unique-filename@^1.1.0, unique-filename@^1.1.1:
+ version "1.1.1"
+ resolved "https://registry.yarnpkg.com/unique-filename/-/unique-filename-1.1.1.tgz#1d69769369ada0583103a1e6ae87681b56573230"
+ integrity sha512-Vmp0jIp2ln35UTXuryvjzkjGdRyf9b2lTXuSYUiPmzRcl3FDtYqAwOnTJkAngD9SWhnoJzDbTKwaOrZ+STtxNQ==
dependencies:
unique-slug "^2.0.0"
unique-slug@^2.0.0:
- version "2.0.0"
- resolved "http://registry.npm.taobao.org/unique-slug/download/unique-slug-2.0.0.tgz#db6676e7c7cc0629878ff196097c78855ae9f4ab"
+ version "2.0.2"
+ resolved "https://registry.yarnpkg.com/unique-slug/-/unique-slug-2.0.2.tgz#baabce91083fc64e945b0f3ad613e264f7cd4e6c"
+ integrity sha512-zoWr9ObaxALD3DOPfjPSqxt4fnZiWblxHIgeWqW8x7UqDzEtHEQLzji2cuJYQFCU6KmoJikOYAZlrTHHebjx2w==
dependencies:
imurmurhash "^0.1.4"
universalify@^0.1.0:
- version "0.1.1"
- resolved "http://registry.npm.taobao.org/universalify/download/universalify-0.1.1.tgz#fa71badd4437af4c148841e3b3b165f9e9e590b7"
+ version "0.1.2"
+ resolved "https://registry.yarnpkg.com/universalify/-/universalify-0.1.2.tgz#b646f69be3942dabcecc9d6639c80dc105efaa66"
+ integrity sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg==
[email protected], unpipe@~1.0.0:
version "1.0.0"
- resolved "http://registry.npm.taobao.org/unpipe/download/unpipe-1.0.0.tgz#b2bf4ee8514aae6165b4817829d21b2ef49904ec"
+ resolved "https://registry.yarnpkg.com/unpipe/-/unpipe-1.0.0.tgz#b2bf4ee8514aae6165b4817829d21b2ef49904ec"
+ integrity sha1-sr9O6FFKrmFltIF4KdIbLvSZBOw=
unset-value@^1.0.0:
version "1.0.0"
- resolved "http://registry.npm.taobao.org/unset-value/download/unset-value-1.0.0.tgz#8376873f7d2335179ffb1e6fc3a8ed0dfc8ab559"
+ resolved "https://registry.yarnpkg.com/unset-value/-/unset-value-1.0.0.tgz#8376873f7d2335179ffb1e6fc3a8ed0dfc8ab559"
+ integrity sha1-g3aHP30jNRef+x5vw6jtDfyKtVk=
dependencies:
has-value "^0.3.1"
isobject "^3.0.0"
-upath@^1.0.0:
- version "1.1.0"
- resolved "http://registry.npm.taobao.org/upath/download/upath-1.1.0.tgz#35256597e46a581db4793d0ce47fa9aebfc9fabd"
+upath@^1.1.1:
+ version "1.1.2"
+ resolved "https://registry.yarnpkg.com/upath/-/upath-1.1.2.tgz#3db658600edaeeccbe6db5e684d67ee8c2acd068"
+ integrity sha512-kXpym8nmDmlCBr7nKdIx8P2jNBa+pBpIUFRnKJ4dr8htyYGJFokkr2ZvERRtUN+9SY+JqXouNgUPtv6JQva/2Q==
upper-case@^1.1.1:
version "1.1.3"
- resolved "http://registry.npm.taobao.org/upper-case/download/upper-case-1.1.3.tgz#f6b4501c2ec4cdd26ba78be7222961de77621598"
+ resolved "https://registry.yarnpkg.com/upper-case/-/upper-case-1.1.3.tgz#f6b4501c2ec4cdd26ba78be7222961de77621598"
+ integrity sha1-9rRQHC7EzdJrp4vnIilh3ndiFZg=
-uri-js@^4.2.1:
+uri-js@^4.2.2:
version "4.2.2"
- resolved "http://registry.npm.taobao.org/uri-js/download/uri-js-4.2.2.tgz#94c540e1ff772956e2299507c010aea6c8838eb0"
+ resolved "https://registry.yarnpkg.com/uri-js/-/uri-js-4.2.2.tgz#94c540e1ff772956e2299507c010aea6c8838eb0"
+ integrity sha512-KY9Frmirql91X2Qgjry0Wd4Y+YTdrdZheS8TFwvkbLWf/G5KNJDCh6pKL5OZctEW4+0Baa5idK2ZQuELRwPznQ==
dependencies:
punycode "^2.1.0"
urijs@^1.18.2:
version "1.19.1"
- resolved "http://registry.npm.taobao.org/urijs/download/urijs-1.19.1.tgz#5b0ff530c0cbde8386f6342235ba5ca6e995d25a"
+ resolved "https://registry.yarnpkg.com/urijs/-/urijs-1.19.1.tgz#5b0ff530c0cbde8386f6342235ba5ca6e995d25a"
+ integrity sha512-xVrGVi94ueCJNrBSTjWqjvtgvl3cyOTThp2zaMaFNGp3F542TR6sM3f2o8RqZl+AwteClSVmoCyt0ka4RjQOQg==
urix@^0.1.0:
version "0.1.0"
- resolved "http://registry.npm.taobao.org/urix/download/urix-0.1.0.tgz#da937f7a62e21fec1fd18d49b35c2935067a6c72"
+ resolved "https://registry.yarnpkg.com/urix/-/urix-0.1.0.tgz#da937f7a62e21fec1fd18d49b35c2935067a6c72"
+ integrity sha1-2pN/emLiH+wf0Y1Js1wpNQZ6bHI=
[email protected]:
- version "1.0.1"
- resolved "http://registry.npm.taobao.org/url-loader/download/url-loader-1.0.1.tgz#61bc53f1f184d7343da2728a1289ef8722ea45ee"
+url-loader@^1.1.2:
+ version "1.1.2"
+ resolved "https://registry.yarnpkg.com/url-loader/-/url-loader-1.1.2.tgz#b971d191b83af693c5e3fea4064be9e1f2d7f8d8"
+ integrity sha512-dXHkKmw8FhPqu8asTc1puBfe3TehOCo2+RmOOev5suNCIYBcT626kxiWg1NBVkwc4rO8BGa7gP70W7VXuqHrjg==
dependencies:
loader-utils "^1.1.0"
mime "^2.0.3"
- schema-utils "^0.4.3"
+ schema-utils "^1.0.0"
-url-parse@^1.1.8, url-parse@~1.4.0:
- version "1.4.0"
- resolved "http://registry.npm.taobao.org/url-parse/download/url-parse-1.4.0.tgz#6bfdaad60098c7fe06f623e42b22de62de0d3d75"
+url-parse@^1.4.3:
+ version "1.4.7"
+ resolved "https://registry.yarnpkg.com/url-parse/-/url-parse-1.4.7.tgz#a8a83535e8c00a316e403a5db4ac1b9b853ae278"
+ integrity sha512-d3uaVyzDB9tQoSXFvuSUNFibTd9zxd2bkVrDRvF5TmvWWQwqE4lgYJ5m+x1DbecWkw+LK4RNl2CU1hHuOKPVlg==
dependencies:
- querystringify "^2.0.0"
+ querystringify "^2.1.1"
requires-port "^1.0.0"
url@^0.11.0:
version "0.11.0"
- resolved "http://registry.npm.taobao.org/url/download/url-0.11.0.tgz#3838e97cfc60521eb73c525a8e55bfdd9e2e28f1"
+ resolved "https://registry.yarnpkg.com/url/-/url-0.11.0.tgz#3838e97cfc60521eb73c525a8e55bfdd9e2e28f1"
+ integrity sha1-ODjpfPxgUh63PFJajlW/3Z4uKPE=
dependencies:
punycode "1.3.2"
querystring "0.2.0"
use@^3.1.0:
- version "3.1.0"
- resolved "http://registry.npm.taobao.org/use/download/use-3.1.0.tgz#14716bf03fdfefd03040aef58d8b4b85f3a7c544"
- dependencies:
- kind-of "^6.0.2"
+ version "3.1.1"
+ resolved "https://registry.yarnpkg.com/use/-/use-3.1.1.tgz#d50c8cac79a19fbc20f2911f56eb973f4e10070f"
+ integrity sha512-cwESVXlO3url9YWlFW/TA9cshCEhtu7IKJ/p5soJ/gGpj7vbvFrAY/eIioQ6Dw23KjZhYgiIo8HOs1nQ2vr/oQ==
-util-deprecate@~1.0.1:
+util-deprecate@^1.0.1, util-deprecate@~1.0.1:
version "1.0.2"
- resolved "http://registry.npm.taobao.org/util-deprecate/download/util-deprecate-1.0.2.tgz#450d4dc9fa70de732762fbd2d4a28981419a0ccf"
+ resolved "https://registry.yarnpkg.com/util-deprecate/-/util-deprecate-1.0.2.tgz#450d4dc9fa70de732762fbd2d4a28981419a0ccf"
+ integrity sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=
[email protected], util.promisify@^1.0.0:
version "1.0.0"
- resolved "http://registry.npm.taobao.org/util.promisify/download/util.promisify-1.0.0.tgz#440f7165a459c9a16dc145eb8e72f35687097030"
+ resolved "https://registry.yarnpkg.com/util.promisify/-/util.promisify-1.0.0.tgz#440f7165a459c9a16dc145eb8e72f35687097030"
+ integrity sha512-i+6qA2MPhvoKLuxnJNpXAGhg7HphQOSUq2LKMZD0m15EiskXUkMvKdF4Uui0WYeCUGea+o2cw/ZuwehtfsrNkA==
dependencies:
define-properties "^1.1.2"
object.getownpropertydescriptors "^2.0.3"
[email protected], util@^0.10.3:
[email protected]:
version "0.10.3"
- resolved "http://registry.npm.taobao.org/util/download/util-0.10.3.tgz#7afb1afe50805246489e3db7fe0ed379336ac0f9"
+ resolved "https://registry.yarnpkg.com/util/-/util-0.10.3.tgz#7afb1afe50805246489e3db7fe0ed379336ac0f9"
+ integrity sha1-evsa/lCAUkZInj23/g7TeTNqwPk=
dependencies:
inherits "2.0.1"
-utila@~0.3:
- version "0.3.3"
- resolved "http://registry.npm.taobao.org/utila/download/utila-0.3.3.tgz#d7e8e7d7e309107092b05f8d9688824d633a4226"
+util@^0.11.0:
+ version "0.11.1"
+ resolved "https://registry.yarnpkg.com/util/-/util-0.11.1.tgz#3236733720ec64bb27f6e26f421aaa2e1b588d61"
+ integrity sha512-HShAsny+zS2TZfaXxD9tYj4HQGlBezXZMZuM/S5PKLLoZkShZiGk9o5CzukI1LVHZvjdvZ2Sj1aW/Ndn2NB/HQ==
+ dependencies:
+ inherits "2.0.3"
-utila@~0.4:
+utila@^0.4.0, utila@~0.4:
version "0.4.0"
- resolved "http://registry.npm.taobao.org/utila/download/utila-0.4.0.tgz#8a16a05d445657a3aea5eecc5b12a4fa5379772c"
+ resolved "https://registry.yarnpkg.com/utila/-/utila-0.4.0.tgz#8a16a05d445657a3aea5eecc5b12a4fa5379772c"
+ integrity sha1-ihagXURWV6Oupe7MWxKk+lN5dyw=
[email protected]:
version "1.0.1"
- resolved "http://registry.npm.taobao.org/utils-merge/download/utils-merge-1.0.1.tgz#9f95710f50a267947b2ccc124741c1028427e713"
+ resolved "https://registry.yarnpkg.com/utils-merge/-/utils-merge-1.0.1.tgz#9f95710f50a267947b2ccc124741c1028427e713"
+ integrity sha1-n5VxD1CiZ5R7LMwSR0HBAoQn5xM=
-uuid@^3.0.0, uuid@^3.0.1, uuid@^3.1.0:
- version "3.2.1"
- resolved "http://registry.npm.taobao.org/uuid/download/uuid-3.2.1.tgz#12c528bb9d58d0b9265d9a2f6f0fe8be17ff1f14"
+uuid@^3.0.1, uuid@^3.3.2:
+ version "3.3.2"
+ resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.3.2.tgz#1b4af4955eb3077c501c23872fc6513811587131"
+ integrity sha512-yXJmeNaw3DnnKAOKJE51sL/ZaYfWJRl1pK9dr19YFCu0ObS231AB1/LbqTKRAQ5kw8A90rA6fr4riOUpTZvQZA==
+
[email protected]:
+ version "2.0.3"
+ resolved "https://registry.yarnpkg.com/v8-compile-cache/-/v8-compile-cache-2.0.3.tgz#00f7494d2ae2b688cfe2899df6ed2c54bef91dbe"
+ integrity sha512-CNmdbwQMBjwr9Gsmohvm0pbL954tJrNzf6gWL3K+QMQf00PF7ERGrEiLgjuU3mKreLC2MeGhUsNV9ybTbLgd3w==
validate-npm-package-license@^3.0.1:
- version "3.0.3"
- resolved "http://registry.npm.taobao.org/validate-npm-package-license/download/validate-npm-package-license-3.0.3.tgz#81643bcbef1bdfecd4623793dc4648948ba98338"
+ version "3.0.4"
+ resolved "https://registry.yarnpkg.com/validate-npm-package-license/-/validate-npm-package-license-3.0.4.tgz#fc91f6b9c7ba15c857f4cb2c5defeec39d4f410a"
+ integrity sha512-DpKm2Ui/xN7/HQKCtpZxoRWBhZ9Z0kqtygG8XCgNQ8ZlDnxuQmWhj566j8fN4Cu3/JmbhsDo7fcAJq4s9h27Ew==
dependencies:
spdx-correct "^3.0.0"
spdx-expression-parse "^3.0.0"
vary@~1.1.2:
version "1.1.2"
- resolved "http://registry.npm.taobao.org/vary/download/vary-1.1.2.tgz#2299f02c6ded30d4a5961b0b9f74524a18f634fc"
-
-vendors@^1.0.0:
- version "1.0.2"
- resolved "http://registry.npm.taobao.org/vendors/download/vendors-1.0.2.tgz#7fcb5eef9f5623b156bcea89ec37d63676f21801"
+ resolved "https://registry.yarnpkg.com/vary/-/vary-1.1.2.tgz#2299f02c6ded30d4a5961b0b9f74524a18f634fc"
+ integrity sha1-IpnwLG3tMNSllhsLn3RSShj2NPw=
[email protected]:
version "1.10.0"
- resolved "http://registry.npm.taobao.org/verror/download/verror-1.10.0.tgz#3a105ca17053af55d6e270c1f8288682e18da400"
+ resolved "https://registry.yarnpkg.com/verror/-/verror-1.10.0.tgz#3a105ca17053af55d6e270c1f8288682e18da400"
+ integrity sha1-OhBcoXBTr1XW4nDB+CiGguGNpAA=
dependencies:
assert-plus "^1.0.0"
core-util-is "1.0.2"
extsprintf "^1.2.0"
[email protected]:
- version "0.0.4"
- resolved "http://registry.npm.taobao.org/vm-browserify/download/vm-browserify-0.0.4.tgz#5d7ea45bbef9e4a6ff65f95438e0a87c357d5a73"
- dependencies:
- indexof "0.0.1"
-
-void-elements@^2.0.1:
- version "2.0.1"
- resolved "http://registry.npm.taobao.org/void-elements/download/void-elements-2.0.1.tgz#c066afb582bb1cb4128d60ea92392e94d5e9dbec"
-
-vue-hot-reload-api@^2.2.0:
- version "2.3.0"
- resolved "http://registry.npm.taobao.org/vue-hot-reload-api/download/vue-hot-reload-api-2.3.0.tgz#97976142405d13d8efae154749e88c4e358cf926"
-
-vue-loader@^14.0.0:
- version "14.2.2"
- resolved "http://registry.npm.taobao.org/vue-loader/download/vue-loader-14.2.2.tgz#c8cf3c2e29b6fb2ee595248a2aa6005038a125b3"
- dependencies:
- consolidate "^0.14.0"
- hash-sum "^1.0.2"
- loader-utils "^1.1.0"
- lru-cache "^4.1.1"
- postcss "^6.0.8"
- postcss-load-config "^1.1.0"
- postcss-selector-parser "^2.0.0"
- prettier "^1.7.0"
- resolve "^1.4.0"
- source-map "^0.6.1"
- vue-hot-reload-api "^2.2.0"
- vue-style-loader "^4.0.1"
- vue-template-es2015-compiler "^1.6.0"
-
-vue-parser@^1.1.5:
- version "1.1.6"
- resolved "http://registry.npm.taobao.org/vue-parser/download/vue-parser-1.1.6.tgz#3063c8431795664ebe429c23b5506899706e6355"
- dependencies:
- parse5 "^3.0.3"
-
-vue-style-loader@^4.0.0, vue-style-loader@^4.0.1:
- version "4.1.0"
- resolved "http://registry.npm.taobao.org/vue-style-loader/download/vue-style-loader-4.1.0.tgz#7588bd778e2c9f8d87bfc3c5a4a039638da7a863"
- dependencies:
- hash-sum "^1.0.2"
- loader-utils "^1.0.2"
-
-vue-template-compiler@^2.5.13:
- version "2.5.16"
- resolved "http://registry.npm.taobao.org/vue-template-compiler/download/vue-template-compiler-2.5.16.tgz#93b48570e56c720cdf3f051cc15287c26fbd04cb"
- dependencies:
- de-indent "^1.0.2"
- he "^1.1.0"
-
-vue-template-es2015-compiler@^1.6.0:
- version "1.6.0"
- resolved "http://registry.npm.taobao.org/vue-template-es2015-compiler/download/vue-template-es2015-compiler-1.6.0.tgz#dc42697133302ce3017524356a6c61b7b69b4a18"
+vm-browserify@^1.0.1:
+ version "1.1.0"
+ resolved "https://registry.yarnpkg.com/vm-browserify/-/vm-browserify-1.1.0.tgz#bd76d6a23323e2ca8ffa12028dc04559c75f9019"
+ integrity sha512-iq+S7vZJE60yejDYM0ek6zg308+UZsdtPExWP9VZoCFCz1zkJoXFnAX7aZfd/ZwrkidzdUZL0C/ryW+JwAiIGw==
w3c-hr-time@^1.0.1:
version "1.0.1"
- resolved "http://registry.npm.taobao.org/w3c-hr-time/download/w3c-hr-time-1.0.1.tgz#82ac2bff63d950ea9e3189a58a65625fedf19045"
+ resolved "https://registry.yarnpkg.com/w3c-hr-time/-/w3c-hr-time-1.0.1.tgz#82ac2bff63d950ea9e3189a58a65625fedf19045"
+ integrity sha1-gqwr/2PZUOqeMYmlimViX+3xkEU=
dependencies:
browser-process-hrtime "^0.1.2"
-walker@~1.0.5:
+walker@^1.0.7, walker@~1.0.5:
version "1.0.7"
- resolved "http://registry.npm.taobao.org/walker/download/walker-1.0.7.tgz#2f7f9b8fd10d677262b18a884e28d19618e028fb"
+ resolved "https://registry.yarnpkg.com/walker/-/walker-1.0.7.tgz#2f7f9b8fd10d677262b18a884e28d19618e028fb"
+ integrity sha1-L3+bj9ENZ3JisYqITijRlhjgKPs=
dependencies:
makeerror "1.0.x"
[email protected]:
- version "2.1.0"
- resolved "http://registry.npm.taobao.org/warning/download/warning-2.1.0.tgz#21220d9c63afc77a8c92111e011af705ce0c6901"
- dependencies:
- loose-envify "^1.0.0"
-
-warning@^3.0.0:
- version "3.0.0"
- resolved "http://registry.npm.taobao.org/warning/download/warning-3.0.0.tgz#32e5377cb572de4ab04753bdf8821c01ed605b7c"
- dependencies:
- loose-envify "^1.0.0"
-
-warning@^4.0.1, warning@~4.0.1:
- version "4.0.2"
- resolved "http://registry.npm.taobao.org/warning/download/warning-4.0.2.tgz#aa6876480872116fa3e11d434b0d0d8d91e44607"
- integrity sha1-qmh2SAhyEW+j4R1DSw0NjZHkRgc=
- dependencies:
- loose-envify "^1.0.0"
-
-watch@~0.18.0:
- version "0.18.0"
- resolved "http://registry.npm.taobao.org/watch/download/watch-0.18.0.tgz#28095476c6df7c90c963138990c0a5423eb4b986"
- dependencies:
- exec-sh "^0.2.0"
- minimist "^1.2.0"
-
-watchpack@^1.4.0:
+watchpack@^1.5.0:
version "1.6.0"
- resolved "http://registry.npm.taobao.org/watchpack/download/watchpack-1.6.0.tgz#4bc12c2ebe8aa277a71f1d3f14d685c7b446cd00"
+ resolved "https://registry.yarnpkg.com/watchpack/-/watchpack-1.6.0.tgz#4bc12c2ebe8aa277a71f1d3f14d685c7b446cd00"
+ integrity sha512-i6dHe3EyLjMmDlU1/bGQpEw25XSjkJULPuAVKCbNRefQVq48yXKUpwg538F7AZTf9kyr57zj++pQFltUa5H7yA==
dependencies:
chokidar "^2.0.2"
graceful-fs "^4.1.2"
neo-async "^2.5.0"
-wavesurfer.js@^2.2.1:
- version "2.2.1"
- resolved "https://registry.npm.taobao.org/wavesurfer.js/download/wavesurfer.js-2.2.1.tgz#066ccd85d1ce70b64bd5a5b491e2c797645a6973"
- integrity sha1-BmzNhdHOcLZL1aW0keLHl2RaaXM=
-
-wbuf@^1.1.0, wbuf@^1.7.2:
+wbuf@^1.1.0, wbuf@^1.7.3:
version "1.7.3"
- resolved "http://registry.npm.taobao.org/wbuf/download/wbuf-1.7.3.tgz#c1d8d149316d3ea852848895cb6a0bfe887b87df"
+ resolved "https://registry.yarnpkg.com/wbuf/-/wbuf-1.7.3.tgz#c1d8d149316d3ea852848895cb6a0bfe887b87df"
+ integrity sha512-O84QOnr0icsbFGLS0O3bI5FswxzRr8/gHwWkDlQFskhSPryQXvrTMxjxGP4+iWYoauLoBvfDpkrOauZ+0iZpDA==
dependencies:
minimalistic-assert "^1.0.0"
-web-ext-types@crimx/web-ext-types:
- version "1.1.9"
- resolved "https://codeload.github.com/crimx/web-ext-types/tar.gz/106fe9d74d54e9cb66e99205795c64cc0bf4df68"
+web-ext-types@latest:
+ version "3.2.0"
+ resolved "https://registry.yarnpkg.com/web-ext-types/-/web-ext-types-3.2.0.tgz#df5cfc6c5b614b8e5a98b51642d1b2ad3b9b41e2"
+ integrity sha512-85MBVBvZTCtc5yTfwz+xKzycrW6lUpBi68Sn8dlMwOFNDyWroUHXRJNCO4Bs80ScfePf7ciF2J2N+1UDWpq1Lg==
+
+webextension-polyfill@latest:
+ version "0.4.0"
+ resolved "https://registry.yarnpkg.com/webextension-polyfill/-/webextension-polyfill-0.4.0.tgz#9cc5a60f0f2bf907a6b349fdd7e61701f54956f9"
+ integrity sha512-oreMp+EoAo1pzRMigx4jB5jInIpx6NTCySPSjGyLLee/dCIPiRqowCEfbFP8o20wz9SOtNwSsfkaJ9D/tRgpag==
+
+webextensions-emulator@^2.0.0:
+ version "2.0.0"
+ resolved "https://registry.yarnpkg.com/webextensions-emulator/-/webextensions-emulator-2.0.0.tgz#1667b748acbbdec1634a2a43ed9c7e6c5ec1749e"
+ integrity sha512-CSkE8dNrNJBljV5dCmPzS47mE7B3grbkiPKipoC517M+ftrImFLgba8diAoTmiTpttEAa9ffYSb+erWFPNYwCg==
+ dependencies:
+ lodash "^4.17.11"
webidl-conversions@^4.0.2:
version "4.0.2"
- resolved "http://registry.npm.taobao.org/webidl-conversions/download/webidl-conversions-4.0.2.tgz#a855980b1f0b6b359ba1d5d9fb39ae941faa63ad"
-
-webpack-bundle-analyzer@^2.11.1:
- version "2.13.1"
- resolved "http://registry.npm.taobao.org/webpack-bundle-analyzer/download/webpack-bundle-analyzer-2.13.1.tgz#07d2176c6e86c3cdce4c23e56fae2a7b6b4ad526"
- dependencies:
- acorn "^5.3.0"
- bfj-node4 "^5.2.0"
- chalk "^2.3.0"
- commander "^2.13.0"
- ejs "^2.5.7"
- express "^4.16.2"
- filesize "^3.5.11"
- gzip-size "^4.1.0"
- lodash "^4.17.4"
- mkdirp "^0.5.1"
- opener "^1.4.3"
- ws "^4.0.0"
+ resolved "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-4.0.2.tgz#a855980b1f0b6b359ba1d5d9fb39ae941faa63ad"
+ integrity sha512-YQ+BmxuTgd6UXZW3+ICGfyqRyHXVlD5GtQr5+qjiNW7bF0cqrzX500HVXPBOvgXb5YnzDd+h0zqyv61KUD7+Sg==
[email protected]:
- version "1.12.2"
- resolved "http://registry.npm.taobao.org/webpack-dev-middleware/download/webpack-dev-middleware-1.12.2.tgz#f8fc1120ce3b4fc5680ceecb43d777966b21105e"
+webpack-chain@^6.0.0:
+ version "6.0.0"
+ resolved "https://registry.yarnpkg.com/webpack-chain/-/webpack-chain-6.0.0.tgz#9c36525a1271a54e7bfd1791199b395f400ae4f1"
+ integrity sha512-NK62XgJOOSmYs4kaXFIKKeClpuOVHY7m6e4XwxbVX/2HAUboH6xFCTVXMVv8+jB6K8o/UGjlo1Cv3XXOyNAAGw==
+ dependencies:
+ deepmerge "^1.5.2"
+ javascript-stringify "^2.0.0"
+
+webpack-cli@^3:
+ version "3.3.5"
+ resolved "https://registry.yarnpkg.com/webpack-cli/-/webpack-cli-3.3.5.tgz#f4d1238a66a2843d9cebf189835ea22142e72767"
+ integrity sha512-w0j/s42c5UhchwTmV/45MLQnTVwRoaUTu9fM5LuyOd/8lFoCNCELDogFoecx5NzRUndO0yD/gF2b02XKMnmAWQ==
+ dependencies:
+ chalk "2.4.2"
+ cross-spawn "6.0.5"
+ enhanced-resolve "4.1.0"
+ findup-sync "3.0.0"
+ global-modules "2.0.0"
+ import-local "2.0.0"
+ interpret "1.2.0"
+ loader-utils "1.2.3"
+ supports-color "6.1.0"
+ v8-compile-cache "2.0.3"
+ yargs "13.2.4"
+
+webpack-dev-middleware@^3.7.0:
+ version "3.7.0"
+ resolved "https://registry.yarnpkg.com/webpack-dev-middleware/-/webpack-dev-middleware-3.7.0.tgz#ef751d25f4e9a5c8a35da600c5fda3582b5c6cff"
+ integrity sha512-qvDesR1QZRIAZHOE3iQ4CXLZZSQ1lAUsSpnQmlB1PBfoN/xdRjmge3Dok0W4IdaVLJOGJy3sGI4sZHwjRU0PCA==
dependencies:
- memory-fs "~0.4.1"
- mime "^1.5.0"
- path-is-absolute "^1.0.0"
- range-parser "^1.0.3"
- time-stamp "^2.0.0"
+ memory-fs "^0.4.1"
+ mime "^2.4.2"
+ range-parser "^1.2.1"
+ webpack-log "^2.0.0"
[email protected]:
- version "2.11.1"
- resolved "http://registry.npm.taobao.org/webpack-dev-server/download/webpack-dev-server-2.11.1.tgz#6f9358a002db8403f016e336816f4485384e5ec0"
+webpack-dev-server@^3:
+ version "3.7.2"
+ resolved "https://registry.yarnpkg.com/webpack-dev-server/-/webpack-dev-server-3.7.2.tgz#f79caa5974b7f8b63268ef5421222a8486d792f5"
+ integrity sha512-mjWtrKJW2T9SsjJ4/dxDC2fkFVUw8jlpemDERqV0ZJIkjjjamR2AbQlr3oz+j4JLhYCHImHnXZK5H06P2wvUew==
dependencies:
ansi-html "0.0.7"
- array-includes "^3.0.3"
bonjour "^3.5.0"
- chokidar "^2.0.0"
- compression "^1.5.2"
- connect-history-api-fallback "^1.3.0"
- debug "^3.1.0"
- del "^3.0.0"
- express "^4.16.2"
- html-entities "^1.2.0"
- http-proxy-middleware "~0.17.4"
- import-local "^1.0.0"
- internal-ip "1.2.0"
+ chokidar "^2.1.6"
+ compression "^1.7.4"
+ connect-history-api-fallback "^1.6.0"
+ debug "^4.1.1"
+ del "^4.1.1"
+ express "^4.17.1"
+ html-entities "^1.2.1"
+ http-proxy-middleware "^0.19.1"
+ import-local "^2.0.0"
+ internal-ip "^4.3.0"
ip "^1.1.5"
- killable "^1.0.0"
- loglevel "^1.4.1"
- opn "^5.1.0"
- portfinder "^1.0.9"
- selfsigned "^1.9.1"
- serve-index "^1.7.2"
+ killable "^1.0.1"
+ loglevel "^1.6.3"
+ opn "^5.5.0"
+ p-retry "^3.0.1"
+ portfinder "^1.0.20"
+ schema-utils "^1.0.0"
+ selfsigned "^1.10.4"
+ semver "^6.1.1"
+ serve-index "^1.9.1"
sockjs "0.3.19"
- sockjs-client "1.1.4"
- spdy "^3.4.1"
- strip-ansi "^3.0.0"
- supports-color "^5.1.0"
- webpack-dev-middleware "1.12.2"
- yargs "6.6.0"
+ sockjs-client "1.3.0"
+ spdy "^4.0.0"
+ strip-ansi "^3.0.1"
+ supports-color "^6.1.0"
+ url "^0.11.0"
+ webpack-dev-middleware "^3.7.0"
+ webpack-log "^2.0.0"
+ yargs "12.0.5"
-webpack-sources@^1.0.1, webpack-sources@^1.1.0:
- version "1.1.0"
- resolved "http://registry.npm.taobao.org/webpack-sources/download/webpack-sources-1.1.0.tgz#a101ebae59d6507354d71d8013950a3a8b7a5a54"
+webpack-log@^2.0.0:
+ version "2.0.0"
+ resolved "https://registry.yarnpkg.com/webpack-log/-/webpack-log-2.0.0.tgz#5b7928e0637593f119d32f6227c1e0ac31e1b47f"
+ integrity sha512-cX8G2vR/85UYG59FgkoMamwHUIkSSlV3bBMRsbxVXVUk2j6NleCKjQ/WE9eYg9WY4w25O9w8wKP4rzNZFmUcUg==
+ dependencies:
+ ansi-colors "^3.0.0"
+ uuid "^3.3.2"
+
+webpack-sources@^1.1.0, webpack-sources@^1.3.0:
+ version "1.3.0"
+ resolved "https://registry.yarnpkg.com/webpack-sources/-/webpack-sources-1.3.0.tgz#2a28dcb9f1f45fe960d8f1493252b5ee6530fa85"
+ integrity sha512-OiVgSrbGu7NEnEvQJJgdSFPl2qWKkWq5lHMhgiToIiN9w34EBnjYzSYs+VbL5KoYiLNtFFa7BZIKxRED3I32pA==
dependencies:
source-list-map "^2.0.0"
source-map "~0.6.1"
[email protected]:
- version "3.11.0"
- resolved "http://registry.npm.taobao.org/webpack/download/webpack-3.11.0.tgz#77da451b1d7b4b117adaf41a1a93b5742f24d894"
- dependencies:
- acorn "^5.0.0"
- acorn-dynamic-import "^2.0.0"
+webpack@^4:
+ version "4.35.2"
+ resolved "https://registry.yarnpkg.com/webpack/-/webpack-4.35.2.tgz#5c8b8a66602cbbd6ec65c6e6747914a61c1449b1"
+ integrity sha512-TZAmorNymV4q66gAM/h90cEjG+N3627Q2MnkSgKlX/z3DlNVKUtqy57lz1WmZU2+FUZwzM+qm7cGaO95PyrX5A==
+ dependencies:
+ "@webassemblyjs/ast" "1.8.5"
+ "@webassemblyjs/helper-module-context" "1.8.5"
+ "@webassemblyjs/wasm-edit" "1.8.5"
+ "@webassemblyjs/wasm-parser" "1.8.5"
+ acorn "^6.0.5"
+ acorn-dynamic-import "^4.0.0"
ajv "^6.1.0"
ajv-keywords "^3.1.0"
- async "^2.1.2"
- enhanced-resolve "^3.4.0"
- escope "^3.6.0"
- interpret "^1.0.0"
- json-loader "^0.5.4"
- json5 "^0.5.1"
+ chrome-trace-event "^1.0.0"
+ enhanced-resolve "^4.1.0"
+ eslint-scope "^4.0.0"
+ json-parse-better-errors "^1.0.2"
loader-runner "^2.3.0"
loader-utils "^1.1.0"
memory-fs "~0.4.1"
+ micromatch "^3.1.8"
mkdirp "~0.5.0"
+ neo-async "^2.5.0"
node-libs-browser "^2.0.0"
- source-map "^0.5.3"
- supports-color "^4.2.1"
- tapable "^0.2.7"
- uglifyjs-webpack-plugin "^0.4.6"
- watchpack "^1.4.0"
- webpack-sources "^1.0.1"
- yargs "^8.0.2"
+ schema-utils "^1.0.0"
+ tapable "^1.1.0"
+ terser-webpack-plugin "^1.1.0"
+ watchpack "^1.5.0"
+ webpack-sources "^1.3.0"
websocket-driver@>=0.5.1:
- version "0.7.0"
- resolved "http://registry.npm.taobao.org/websocket-driver/download/websocket-driver-0.7.0.tgz#0caf9d2d755d93aee049d4bdd0d3fe2cca2a24eb"
+ version "0.7.3"
+ resolved "https://registry.yarnpkg.com/websocket-driver/-/websocket-driver-0.7.3.tgz#a2d4e0d4f4f116f1e6297eba58b05d430100e9f9"
+ integrity sha512-bpxWlvbbB459Mlipc5GBzzZwhoZgGEZLuqPaR0INBGnPAY1vdBX6hPnoFXiw+3yWxDuHyQjO2oXTMyS8A5haFg==
dependencies:
- http-parser-js ">=0.4.0"
+ http-parser-js ">=0.4.0 <0.4.11"
+ safe-buffer ">=5.1.0"
websocket-extensions ">=0.1.1"
websocket-extensions@>=0.1.1:
version "0.1.3"
- resolved "http://registry.npm.taobao.org/websocket-extensions/download/websocket-extensions-0.1.3.tgz#5d2ff22977003ec687a4b87073dfbbac146ccf29"
+ resolved "https://registry.yarnpkg.com/websocket-extensions/-/websocket-extensions-0.1.3.tgz#5d2ff22977003ec687a4b87073dfbbac146ccf29"
+ integrity sha512-nqHUnMXmBzT0w570r2JpJxfiSD1IzoI+HGVdd3aZ0yNi3ngvQ4jv1dtHt5VGxfI2yj5yqImPhOK4vmIh2xMbGg==
whatwg-encoding@^1.0.1, whatwg-encoding@^1.0.3:
- version "1.0.3"
- resolved "http://registry.npm.taobao.org/whatwg-encoding/download/whatwg-encoding-1.0.3.tgz#57c235bc8657e914d24e1a397d3c82daee0a6ba3"
+ version "1.0.5"
+ resolved "https://registry.yarnpkg.com/whatwg-encoding/-/whatwg-encoding-1.0.5.tgz#5abacf777c32166a51d085d6b4f3e7d27113ddb0"
+ integrity sha512-b5lim54JOPN9HtzvK9HFXvBma/rnfFeqsic0hSpjtDbVxR3dJKLc+KB4V6GgiGOvl7CY/KNh8rxSo9DKQrnUEw==
dependencies:
- iconv-lite "0.4.19"
-
-whatwg-fetch@>=0.10.0:
- version "2.0.4"
- resolved "http://registry.npm.taobao.org/whatwg-fetch/download/whatwg-fetch-2.0.4.tgz#dde6a5df315f9d39991aa17621853d720b85566f"
+ iconv-lite "0.4.24"
-whatwg-mimetype@^2.0.0, whatwg-mimetype@^2.1.0:
- version "2.1.0"
- resolved "http://registry.npm.taobao.org/whatwg-mimetype/download/whatwg-mimetype-2.1.0.tgz#f0f21d76cbba72362eb609dbed2a30cd17fcc7d4"
+whatwg-mimetype@^2.1.0, whatwg-mimetype@^2.2.0:
+ version "2.3.0"
+ resolved "https://registry.yarnpkg.com/whatwg-mimetype/-/whatwg-mimetype-2.3.0.tgz#3d4b1e0312d2079879f826aff18dbeeca5960fbf"
+ integrity sha512-M4yMwr6mAnQz76TbJm914+gPpB/nCwvZbJU28cUD6dR004SAxDLOOSUaB1JDRqLtaOV/vi0IC5lEAGFgrjGv/g==
-whatwg-url@^6.4.0, whatwg-url@^6.4.1:
- version "6.4.1"
- resolved "http://registry.npm.taobao.org/whatwg-url/download/whatwg-url-6.4.1.tgz#fdb94b440fd4ad836202c16e9737d511f012fd67"
+whatwg-url@^6.4.1:
+ version "6.5.0"
+ resolved "https://registry.yarnpkg.com/whatwg-url/-/whatwg-url-6.5.0.tgz#f2df02bff176fd65070df74ad5ccbb5a199965a8"
+ integrity sha512-rhRZRqx/TLJQWUpQ6bmrt2UV4f0HCQ463yQuONJqC6fO2VoEb1pTYddbe59SkYq87aoM5A3bdhMZiUiVws+fzQ==
dependencies:
lodash.sortby "^4.7.0"
tr46 "^1.0.1"
webidl-conversions "^4.0.2"
-whet.extend@~0.9.9:
- version "0.9.9"
- resolved "http://registry.npm.taobao.org/whet.extend/download/whet.extend-0.9.9.tgz#f877d5bf648c97e5aa542fadc16d6a259b9c11a1"
-
-which-module@^1.0.0:
- version "1.0.0"
- resolved "http://registry.npm.taobao.org/which-module/download/which-module-1.0.0.tgz#bba63ca861948994ff307736089e3b96026c2a4f"
+whatwg-url@^7.0.0:
+ version "7.0.0"
+ resolved "https://registry.yarnpkg.com/whatwg-url/-/whatwg-url-7.0.0.tgz#fde926fa54a599f3adf82dff25a9f7be02dc6edd"
+ integrity sha512-37GeVSIJ3kn1JgKyjiYNmSLP1yzbpb29jdmwBSgkD9h40/hyrR/OifpVUndji3tmwGgD8qpw7iQu3RSbCrBpsQ==
+ dependencies:
+ lodash.sortby "^4.7.0"
+ tr46 "^1.0.1"
+ webidl-conversions "^4.0.2"
which-module@^2.0.0:
version "2.0.0"
- resolved "http://registry.npm.taobao.org/which-module/download/which-module-2.0.0.tgz#d9ef07dce77b9902b8a3a8fa4b31c3e3f7e6e87a"
+ resolved "https://registry.yarnpkg.com/which-module/-/which-module-2.0.0.tgz#d9ef07dce77b9902b8a3a8fa4b31c3e3f7e6e87a"
+ integrity sha1-2e8H3Od7mQK4o6j6SzHD4/fm6Ho=
-which@1, which@^1.2.12, which@^1.2.14, which@^1.2.9, which@^1.3.0:
+which@^1.2.14, which@^1.2.9, which@^1.3.0, which@^1.3.1:
version "1.3.1"
- resolved "http://registry.npm.taobao.org/which/download/which-1.3.1.tgz#a45043d54f5805316da8d62f9f50918d3da70b0a"
+ resolved "https://registry.yarnpkg.com/which/-/which-1.3.1.tgz#a45043d54f5805316da8d62f9f50918d3da70b0a"
+ integrity sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==
dependencies:
isexe "^2.0.0"
wide-align@^1.1.0:
version "1.1.3"
- resolved "http://registry.npm.taobao.org/wide-align/download/wide-align-1.1.3.tgz#ae074e6bdc0c14a431e804e624549c633b000457"
+ resolved "https://registry.yarnpkg.com/wide-align/-/wide-align-1.1.3.tgz#ae074e6bdc0c14a431e804e624549c633b000457"
+ integrity sha512-QGkOQc8XL6Bt5PwnsExKBPuMKBxnGxWWW3fU55Xt4feHozMUhdUMaBCk290qpm/wG5u/RSKzwdAC4i51YigihA==
dependencies:
string-width "^1.0.2 || 2"
[email protected]:
- version "0.1.0"
- resolved "http://registry.npm.taobao.org/window-size/download/window-size-0.1.0.tgz#5438cd2ea93b202efa3a19fe8887aee7c94f9c9d"
-
word-wrap@^1.0.3:
version "1.2.3"
- resolved "http://registry.npm.taobao.org/word-wrap/download/word-wrap-1.2.3.tgz#610636f6b1f703891bd34771ccb17fb93b47079c"
-
[email protected]:
- version "0.0.2"
- resolved "http://registry.npm.taobao.org/wordwrap/download/wordwrap-0.0.2.tgz#b79669bb42ecb409f83d583cad52ca17eaa1643f"
+ resolved "https://registry.yarnpkg.com/word-wrap/-/word-wrap-1.2.3.tgz#610636f6b1f703891bd34771ccb17fb93b47079c"
+ integrity sha512-Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ==
wordwrap@~0.0.2:
version "0.0.3"
- resolved "http://registry.npm.taobao.org/wordwrap/download/wordwrap-0.0.3.tgz#a3d5da6cd5c0bc0008d37234bbaf1bed63059107"
+ resolved "https://registry.yarnpkg.com/wordwrap/-/wordwrap-0.0.3.tgz#a3d5da6cd5c0bc0008d37234bbaf1bed63059107"
+ integrity sha1-o9XabNXAvAAI03I0u68b7WMFkQc=
wordwrap@~1.0.0:
version "1.0.0"
- resolved "http://registry.npm.taobao.org/wordwrap/download/wordwrap-1.0.0.tgz#27584810891456a4171c8d0226441ade90cbcaeb"
+ resolved "https://registry.yarnpkg.com/wordwrap/-/wordwrap-1.0.0.tgz#27584810891456a4171c8d0226441ade90cbcaeb"
+ integrity sha1-J1hIEIkUVqQXHI0CJkQa3pDLyus=
-worker-farm@^1.5.2:
- version "1.6.0"
- resolved "http://registry.npm.taobao.org/worker-farm/download/worker-farm-1.6.0.tgz#aecc405976fab5a95526180846f0dba288f3a4a0"
+worker-farm@^1.7.0:
+ version "1.7.0"
+ resolved "https://registry.yarnpkg.com/worker-farm/-/worker-farm-1.7.0.tgz#26a94c5391bbca926152002f69b84a4bf772e5a8"
+ integrity sha512-rvw3QTZc8lAxyVrqcSGVm5yP/IJ2UcB3U0graE3LCFoZ0Yn2x4EoVSqJKdB/T5M+FLcRPjz4TDacRf3OCfNUzw==
dependencies:
errno "~0.1.7"
wrap-ansi@^2.0.0:
version "2.1.0"
- resolved "http://registry.npm.taobao.org/wrap-ansi/download/wrap-ansi-2.1.0.tgz#d8fc3d284dd05794fe84973caecdd1cf824fdd85"
+ resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-2.1.0.tgz#d8fc3d284dd05794fe84973caecdd1cf824fdd85"
+ integrity sha1-2Pw9KE3QV5T+hJc8rs3Rz4JP3YU=
dependencies:
string-width "^1.0.1"
strip-ansi "^3.0.1"
-wrapper-webpack-plugin@^1.0.0:
- version "1.0.0"
- resolved "http://registry.npm.taobao.org/wrapper-webpack-plugin/download/wrapper-webpack-plugin-1.0.0.tgz#55c11647f8ca990ff6f04b41d8fa4af096c31bbb"
+wrap-ansi@^5.1.0:
+ version "5.1.0"
+ resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-5.1.0.tgz#1fd1f67235d5b6d0fee781056001bfb694c03b09"
+ integrity sha512-QC1/iN/2/RPVJ5jYK8BGttj5z83LmSKmvbvrXPNCLZSEb32KKVDJDl/MOt2N01qU2H/FkzEa9PKto1BqDjtd7Q==
dependencies:
- webpack-sources "^1.0.1"
+ ansi-styles "^3.2.0"
+ string-width "^3.0.0"
+ strip-ansi "^5.0.0"
wrappy@1:
version "1.0.2"
- resolved "http://registry.npm.taobao.org/wrappy/download/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f"
+ resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f"
+ integrity sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=
-write-file-atomic@^2.1.0:
- version "2.3.0"
- resolved "http://registry.npm.taobao.org/write-file-atomic/download/write-file-atomic-2.3.0.tgz#1ff61575c2e2a4e8e510d6fa4e243cce183999ab"
[email protected]:
+ version "2.4.1"
+ resolved "https://registry.yarnpkg.com/write-file-atomic/-/write-file-atomic-2.4.1.tgz#d0b05463c188ae804396fd5ab2a370062af87529"
+ integrity sha512-TGHFeZEZMnv+gBFRfjAcxL5bPHrsGKtnb4qsFAws7/vlh+QfwAaySIw4AXP9ZskTTh5GWu3FLuJhsWVdiJPGvg==
dependencies:
graceful-fs "^4.1.11"
imurmurhash "^0.1.4"
signal-exit "^3.0.2"
-ws@^4.0.0:
- version "4.1.0"
- resolved "http://registry.npm.taobao.org/ws/download/ws-4.1.0.tgz#a979b5d7d4da68bf54efe0408967c324869a7289"
[email protected]:
+ version "1.0.3"
+ resolved "https://registry.yarnpkg.com/write/-/write-1.0.3.tgz#0800e14523b923a387e415123c865616aae0f5c3"
+ integrity sha512-/lg70HAjtkUgWPVZhZcm+T4hkL8Zbtp1nFNOn3lRrxnlv50SRBv7cR7RqR+GMsd3hUXy9hWBo4CHTbFTcOYwig==
+ dependencies:
+ mkdirp "^0.5.1"
+
+ws@^5.2.0:
+ version "5.2.2"
+ resolved "https://registry.yarnpkg.com/ws/-/ws-5.2.2.tgz#dffef14866b8e8dc9133582514d1befaf96e980f"
+ integrity sha512-jaHFD6PFv6UgoIVda6qZllptQsMlDEJkTQcybzzXDYM1XO9Y8em691FGMPmM46WGyLU4z9KMgQN+qrux/nhlHA==
dependencies:
async-limiter "~1.0.0"
- safe-buffer "~5.1.0"
xml-name-validator@^3.0.0:
version "3.0.0"
- resolved "http://registry.npm.taobao.org/xml-name-validator/download/xml-name-validator-3.0.0.tgz#6ae73e06de4d8c6e47f9fb181f78d648ad457c6a"
-
[email protected]:
- version "4.0.0"
- resolved "http://registry.npm.taobao.org/xregexp/download/xregexp-4.0.0.tgz#e698189de49dd2a18cc5687b05e17c8e43943020"
+ resolved "https://registry.yarnpkg.com/xml-name-validator/-/xml-name-validator-3.0.0.tgz#6ae73e06de4d8c6e47f9fb181f78d648ad457c6a"
+ integrity sha512-A5CUptxDsvxKJEU3yO6DuWBSJz/qizqzJKOMIfUJHETbBw/sFaDxgd6fxm1ewUaM0jZ444Fc5vC5ROYurg/4Pw==
xtend@^4.0.0, xtend@~4.0.1:
version "4.0.1"
- resolved "http://registry.npm.taobao.org/xtend/download/xtend-4.0.1.tgz#a5c6d532be656e23db820efb943a1f04998d63af"
+ resolved "https://registry.yarnpkg.com/xtend/-/xtend-4.0.1.tgz#a5c6d532be656e23db820efb943a1f04998d63af"
+ integrity sha1-pcbVMr5lbiPbgg77lDofBJmNY68=
-y18n@^3.2.1:
- version "3.2.1"
- resolved "http://registry.npm.taobao.org/y18n/download/y18n-3.2.1.tgz#6d15fba884c08679c0d77e88e7759e811e07fa41"
-
-y18n@^4.0.0:
+"y18n@^3.2.1 || ^4.0.0", y18n@^4.0.0:
version "4.0.0"
- resolved "http://registry.npm.taobao.org/y18n/download/y18n-4.0.0.tgz#95ef94f85ecc81d007c264e190a120f0a3c8566b"
+ resolved "https://registry.yarnpkg.com/y18n/-/y18n-4.0.0.tgz#95ef94f85ecc81d007c264e190a120f0a3c8566b"
+ integrity sha512-r9S/ZyXu/Xu9q1tYlpsLIsa3EeLXXk0VwlxqTcFRfg9EhMW+17kbt9G0NrgCmhGb5vT2hyhJZLfDGx+7+5Uj/w==
yallist@^2.1.2:
version "2.1.2"
- resolved "http://registry.npm.taobao.org/yallist/download/yallist-2.1.2.tgz#1c11f9218f076089a47dd512f93c6699a6a81d52"
-
-yallist@^3.0.0, yallist@^3.0.2:
- version "3.0.2"
- resolved "http://registry.npm.taobao.org/yallist/download/yallist-3.0.2.tgz#8452b4bb7e83c7c188d8041c1a837c773d6d8bb9"
-
-yargs-parser@^4.2.0:
- version "4.2.1"
- resolved "http://registry.npm.taobao.org/yargs-parser/download/yargs-parser-4.2.1.tgz#29cceac0dc4f03c6c87b4a9f217dd18c9f74871c"
- dependencies:
- camelcase "^3.0.0"
-
-yargs-parser@^5.0.0:
- version "5.0.0"
- resolved "http://registry.npm.taobao.org/yargs-parser/download/yargs-parser-5.0.0.tgz#275ecf0d7ffe05c77e64e7c86e4cd94bf0e1228a"
- dependencies:
- camelcase "^3.0.0"
+ resolved "https://registry.yarnpkg.com/yallist/-/yallist-2.1.2.tgz#1c11f9218f076089a47dd512f93c6699a6a81d52"
+ integrity sha1-HBH5IY8HYImkfdUS+TxmmaaoHVI=
-yargs-parser@^7.0.0:
- version "7.0.0"
- resolved "http://registry.npm.taobao.org/yargs-parser/download/yargs-parser-7.0.0.tgz#8d0ac42f16ea55debd332caf4c4038b3e3f5dfd9"
- dependencies:
- camelcase "^4.1.0"
+yallist@^3.0.0, yallist@^3.0.2, yallist@^3.0.3:
+ version "3.0.3"
+ resolved "https://registry.yarnpkg.com/yallist/-/yallist-3.0.3.tgz#b4b049e314be545e3ce802236d6cd22cd91c3de9"
+ integrity sha512-S+Zk8DEWE6oKpV+vI3qWkaK+jSbIK86pCwe2IF/xwIpQ8jEuxpw9NyaGjmp9+BoJv5FV2piqCDcoCtStppiq2A==
-yargs-parser@^8.1.0:
- version "8.1.0"
- resolved "http://registry.npm.taobao.org/yargs-parser/download/yargs-parser-8.1.0.tgz#f1376a33b6629a5d063782944da732631e966950"
+yargs-parser@^10.0.0:
+ version "10.1.0"
+ resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-10.1.0.tgz#7202265b89f7e9e9f2e5765e0fe735a905edbaa8"
+ integrity sha512-VCIyR1wJoEBZUqk5PA+oOBF6ypbwh5aNB3I50guxAL/quggdfs4TtNHQrSazFA3fYZ+tEqfs0zIGlv0c/rgjbQ==
dependencies:
camelcase "^4.1.0"
-yargs-parser@^9.0.2:
- version "9.0.2"
- resolved "http://registry.npm.taobao.org/yargs-parser/download/yargs-parser-9.0.2.tgz#9ccf6a43460fe4ed40a9bb68f48d43b8a68cc077"
+yargs-parser@^11.1.1:
+ version "11.1.1"
+ resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-11.1.1.tgz#879a0865973bca9f6bab5cbdf3b1c67ec7d3bcf4"
+ integrity sha512-C6kB/WJDiaxONLJQnF8ccx9SEeoTTLek8RVbaOIsrAUS8VrBEXfmeSnCZxygc+XC2sNMBIwOOnfcxiynjHsVSQ==
dependencies:
- camelcase "^4.1.0"
+ camelcase "^5.0.0"
+ decamelize "^1.2.0"
[email protected]:
- version "6.6.0"
- resolved "http://registry.npm.taobao.org/yargs/download/yargs-6.6.0.tgz#782ec21ef403345f830a808ca3d513af56065208"
+yargs-parser@^13.0.0, yargs-parser@^13.1.0, yargs-parser@^13.1.1:
+ version "13.1.1"
+ resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-13.1.1.tgz#d26058532aa06d365fe091f6a1fc06b2f7e5eca0"
+ integrity sha512-oVAVsHz6uFrg3XQheFII8ESO2ssAf9luWuAd6Wexsu4F3OtIW0o8IribPXYrD4WC24LWtPrJlGy87y5udK+dxQ==
dependencies:
- camelcase "^3.0.0"
- cliui "^3.2.0"
- decamelize "^1.1.1"
- get-caller-file "^1.0.1"
- os-locale "^1.4.0"
- read-pkg-up "^1.0.1"
- require-directory "^2.1.1"
- require-main-filename "^1.0.1"
- set-blocking "^2.0.0"
- string-width "^1.0.2"
- which-module "^1.0.0"
- y18n "^3.2.1"
- yargs-parser "^4.2.0"
+ camelcase "^5.0.0"
+ decamelize "^1.2.0"
-yargs@^10.0.3:
- version "10.1.2"
- resolved "http://registry.npm.taobao.org/yargs/download/yargs-10.1.2.tgz#454d074c2b16a51a43e2fb7807e4f9de69ccb5c5"
[email protected], yargs@^12.0.2:
+ version "12.0.5"
+ resolved "https://registry.yarnpkg.com/yargs/-/yargs-12.0.5.tgz#05f5997b609647b64f66b81e3b4b10a368e7ad13"
+ integrity sha512-Lhz8TLaYnxq/2ObqHDql8dX8CJi97oHxrjUcYtzKbbykPtVW9WB+poxI+NM2UIzsMgNCZTIf0AQwsjK5yMAqZw==
dependencies:
cliui "^4.0.0"
- decamelize "^1.1.1"
- find-up "^2.1.0"
+ decamelize "^1.2.0"
+ find-up "^3.0.0"
get-caller-file "^1.0.1"
- os-locale "^2.0.0"
+ os-locale "^3.0.0"
require-directory "^2.1.1"
require-main-filename "^1.0.1"
set-blocking "^2.0.0"
string-width "^2.0.0"
which-module "^2.0.0"
- y18n "^3.2.1"
- yargs-parser "^8.1.0"
+ y18n "^3.2.1 || ^4.0.0"
+ yargs-parser "^11.1.1"
-yargs@^11.0.0:
- version "11.0.0"
- resolved "http://registry.npm.taobao.org/yargs/download/yargs-11.0.0.tgz#c052931006c5eee74610e5fc0354bedfd08a201b"
[email protected]:
+ version "13.2.2"
+ resolved "https://registry.yarnpkg.com/yargs/-/yargs-13.2.2.tgz#0c101f580ae95cea7f39d927e7770e3fdc97f993"
+ integrity sha512-WyEoxgyTD3w5XRpAQNYUB9ycVH/PQrToaTXdYXRdOXvEy1l19br+VJsc0vcO8PTGg5ro/l/GY7F/JMEBmI0BxA==
dependencies:
cliui "^4.0.0"
- decamelize "^1.1.1"
- find-up "^2.1.0"
- get-caller-file "^1.0.1"
- os-locale "^2.0.0"
+ find-up "^3.0.0"
+ get-caller-file "^2.0.1"
+ os-locale "^3.1.0"
require-directory "^2.1.1"
- require-main-filename "^1.0.1"
+ require-main-filename "^2.0.0"
set-blocking "^2.0.0"
- string-width "^2.0.0"
+ string-width "^3.0.0"
which-module "^2.0.0"
- y18n "^3.2.1"
- yargs-parser "^9.0.2"
-
-yargs@^7.0.0:
- version "7.1.0"
- resolved "http://registry.npm.taobao.org/yargs/download/yargs-7.1.0.tgz#6ba318eb16961727f5d284f8ea003e8d6154d0c8"
- dependencies:
- camelcase "^3.0.0"
- cliui "^3.2.0"
- decamelize "^1.1.1"
- get-caller-file "^1.0.1"
- os-locale "^1.4.0"
- read-pkg-up "^1.0.1"
- require-directory "^2.1.1"
- require-main-filename "^1.0.1"
- set-blocking "^2.0.0"
- string-width "^1.0.2"
- which-module "^1.0.0"
- y18n "^3.2.1"
- yargs-parser "^5.0.0"
+ y18n "^4.0.0"
+ yargs-parser "^13.0.0"
-yargs@^8.0.1, yargs@^8.0.2:
- version "8.0.2"
- resolved "http://registry.npm.taobao.org/yargs/download/yargs-8.0.2.tgz#6299a9055b1cefc969ff7e79c1d918dceb22c360"
[email protected]:
+ version "13.2.4"
+ resolved "https://registry.yarnpkg.com/yargs/-/yargs-13.2.4.tgz#0b562b794016eb9651b98bd37acf364aa5d6dc83"
+ integrity sha512-HG/DWAJa1PAnHT9JAhNa8AbAv3FPaiLzioSjCcmuXXhP8MlpHO5vwls4g4j6n30Z74GVQj8Xa62dWVx1QCGklg==
dependencies:
- camelcase "^4.1.0"
- cliui "^3.2.0"
- decamelize "^1.1.1"
- get-caller-file "^1.0.1"
- os-locale "^2.0.0"
- read-pkg-up "^2.0.0"
+ cliui "^5.0.0"
+ find-up "^3.0.0"
+ get-caller-file "^2.0.1"
+ os-locale "^3.1.0"
require-directory "^2.1.1"
- require-main-filename "^1.0.1"
+ require-main-filename "^2.0.0"
set-blocking "^2.0.0"
- string-width "^2.0.0"
+ string-width "^3.0.0"
which-module "^2.0.0"
- y18n "^3.2.1"
- yargs-parser "^7.0.0"
-
-yargs@~3.10.0:
- version "3.10.0"
- resolved "http://registry.npm.taobao.org/yargs/download/yargs-3.10.0.tgz#f7ee7bd857dd7c1d2d38c0e74efbd681d1431fd1"
- dependencies:
- camelcase "^1.0.2"
- cliui "^2.1.0"
- decamelize "^1.0.0"
- window-size "0.1.0"
+ y18n "^4.0.0"
+ yargs-parser "^13.1.0"
-zip-stream@^1.2.0:
- version "1.2.0"
- resolved "http://registry.npm.taobao.org/zip-stream/download/zip-stream-1.2.0.tgz#a8bc45f4c1b49699c6b90198baacaacdbcd4ba04"
+zip-stream@^2.0.1:
+ version "2.0.1"
+ resolved "https://registry.yarnpkg.com/zip-stream/-/zip-stream-2.0.1.tgz#48a062488afe91dda42f823700fae589753ccd34"
+ integrity sha512-c+eUhhkDpaK87G/py74wvWLtz2kzMPNCCkUApkun50ssE0oQliIQzWpTnwjB+MTKVIf2tGzIgHyqW/Y+W77ecQ==
dependencies:
- archiver-utils "^1.3.0"
+ archiver-utils "^2.0.0"
compress-commons "^1.2.0"
- lodash "^4.8.0"
readable-stream "^2.0.0"
|
build
|
update build system to neutrino and babel-ts
|
0535357aaad0ff9d29d91d18f88220de231773f5
|
2020-04-28 11:43:40
|
crimx
|
docs: wording
| false
|
diff --git a/CONTRIBUTING-zh.md b/CONTRIBUTING-zh.md
index aefcc41ed..0f254d6de 100644
--- a/CONTRIBUTING-zh.md
+++ b/CONTRIBUTING-zh.md
@@ -4,19 +4,24 @@
## 贡献前注意
-:warning: 除非是小的修复，在动手前建议新开一个 WIP（施工中）issue 或 PR 阐述你要做的东西以及将要如何实现，以保证大家达成一致认识，而不白白浪费大家的时间和精力。
+:warning: 除非是小的修复，在动手前建议新开一个 WIP（施工中）issue 或 PR 阐述你要做的东西以及将要如何实现，以保证大家达成一致认识，而不白白浪费互相的时间与精力。
- 先阅读 [如何开始](#如何开始).
-- 遵循[代码格式](#代码格式)以及[commit格式](#commit格式).
+- 遵循[代码格式](#代码格式)以及 [commit 格式](#commit格式).
- 提交前先本地跑[测试](#测试)以及[构建](#构建)。也可以交给 CI 处理。
## 如何开始
-克隆仓库安装 `yarn install`。
+```bash
+git clone [email protected]:crimx/ext-saladict.git
+cd ext-saladict
+yarn install
+yarn pdf
+```
## 修改 UI
-运行 `yarn fixtures` 下载测试文件（下载完成不必再运行）。
+运行 `yarn fixtures` 下载测试文件（下载完成以后不必再运行）。
运行 `yarn storybook` 查看所有 UI 组件。
@@ -37,7 +42,7 @@
## 如何添加词典
-由于安全性和可维护性，沙拉查词不提供热添加词典的功能，所有的词典添加必须向本项目提交 PR 合并。如果词典使用了未公开接口请另起项目发布到 NPM 再引用进来。
+出于安全性和可维护性，沙拉查词不提供热添加词典的功能，所有的词典添加必须向本项目提交 PR 合并。如果词典使用了未公开接口请另起项目发布到 NPM 再引用进来。
1. 在 [`src/components/dictionaries/`](./src/components/dictionaries/) 下以词典 id 新建一个目录。
1. 可参考已有的词典如[必应](./src/components/dictionaries/bing)，复制文件到新建的目录中。
@@ -61,14 +66,14 @@
1. 新建 `fixtures.js` 在 `test/specs/components/dictionaries/[dictID]` 下。
- 格式可参考其它词典。
- - 每个结果你可以提供页面链接或者 axios 设置（见 `mojidict` 词典）。所以之前的请求结果会保存为数组传给下个请求。
+ - 每个请求可以提供页面链接或者 axios 设置（见 `mojidict` 词典）。如果后面的请求依赖前面请求的结果，可以通过参数获得。
1. 运行 `yarn fixtures` 下载结果。
1. 编辑 `test/specs/components/dictionaries/[dictID]/request.mock.ts`。它会在开发时拦截词典请求并返回下载好的结果。
1. 运行 `yarn storybook`。
### 添加测试
-1. 添加 `engine.spec.ts` 测试引擎。
+1. 添加 `[dictID]/engine.spec.ts` 测试引擎。
## 代码格式
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 92356a8ba..b2ea5fc16 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -12,7 +12,12 @@
## How to get started
-Clone the repo and run `yarn install`.
+```bash
+git clone [email protected]:crimx/ext-saladict.git
+cd ext-saladict
+yarn install
+yarn pdf
+```
## UI Tweaking
@@ -70,7 +75,7 @@ To develop the component in Storybook we need to intercept http requests from di
### Add Testing
-1. Add `engine.spec.ts` to test the engine.
+1. Add `[dictID]/engine.spec.ts` to test the engine.
## Code Style
diff --git a/README-zh.md b/README-zh.md
index ef38f01e3..3d48ef768 100644
--- a/README-zh.md
+++ b/README-zh.md
@@ -37,7 +37,7 @@ yarn install
yarn pdf
```
-在项目跟添加 `.env` 文件，参考 `.env.example` 格式（可留空如果你不要这些词典）。
+在项目根添加 `.env` 文件，参考 `.env.example` 格式（可留空如果你不需要这些词典）。
```bash
yarn build
|
docs
|
wording
|
43907c4711ed0391a61f4822c58c864ee82c750a
|
2019-05-11 09:47:22
|
CRIMX
|
refactor: do not send self message on background page
| false
|
diff --git a/src/_helpers/browser-api.ts b/src/_helpers/browser-api.ts
index 3def0a543..bcec24cdc 100644
--- a/src/_helpers/browser-api.ts
+++ b/src/_helpers/browser-api.ts
@@ -420,7 +420,8 @@ function initServer (): void {
if (sender.tab && sender.tab.id) {
return messageSend(sender.tab.id, message)
} else {
- return messageSend(message)
+ // has to be a tab
+ // return messageSend(message)
}
}
})
|
refactor
|
do not send self message on background page
|
d1dcdebf780e4c578d4792b618be1b7ddf5a1c4f
|
2018-10-16 14:42:20
|
CRIMX
|
fix(content): fix triple ctrl switch
| false
|
diff --git a/src/content/redux/modules/widget.ts b/src/content/redux/modules/widget.ts
index f7eb710d7..0ab2c4433 100644
--- a/src/content/redux/modules/widget.ts
+++ b/src/content/redux/modules/widget.ts
@@ -842,6 +842,10 @@ function listenTrpleCtrl (
) {
message.self.addListener(MsgType.TripleCtrl, () => {
const { config, widget } = getState()
+ if (!config.tripleCtrl) {
+ return
+ }
+
if (!config.tripleCtrlStandalone && widget.shouldPanelShow) {
return
}
diff --git a/src/selection/index.ts b/src/selection/index.ts
index a694835f8..9b7a3508a 100644
--- a/src/selection/index.ts
+++ b/src/selection/index.ts
@@ -108,7 +108,9 @@ if (!window.name.startsWith('saladict-') && !isSaladictOptionsPage) {
)),
filter(group => group.length >= 3),
).subscribe(() => {
- message.self.send({ type: MsgType.TripleCtrl })
+ if (config.tripleCtrl) {
+ message.self.send({ type: MsgType.TripleCtrl })
+ }
})
}
|
fix
|
fix triple ctrl switch
|
deecdcc58de544982c880199813fb1df7ff5eb98
|
2018-04-25 21:32:03
|
CRIMX
|
feat(content): supprot max height
| false
|
diff --git a/src/app-config.ts b/src/app-config.ts
index 883277ded..d4c764b39 100644
--- a/src/app-config.ts
+++ b/src/app-config.ts
@@ -244,6 +244,9 @@ export interface AppConfigMutable {
/** panel width */
panelWidth: number
+ /** panel max height */
+ panelMaxHeightRatio: number
+
/** panel font-size */
fontSize: number
@@ -344,6 +347,8 @@ export function appConfigFactory (): AppConfig {
panelWidth: 400,
+ panelMaxHeightRatio: 0.8,
+
fontSize: 12,
pdfSniff: true,
diff --git a/src/content/components/DictPanelPortal/index.tsx b/src/content/components/DictPanelPortal/index.tsx
index 150ad1bad..b97e52a49 100644
--- a/src/content/components/DictPanelPortal/index.tsx
+++ b/src/content/components/DictPanelPortal/index.tsx
@@ -137,7 +137,7 @@ export default class DictPanelPortal extends React.Component<DictPanelPortalProp
const iframeStyle = this.frame.style
iframeStyle.setProperty('width', width + 'px', 'important')
iframeStyle.setProperty('height', height + 'px', 'important')
- iframeStyle.setProperty('transform', `translate3d(${x}px, ${y}px, 0)`, 'important')
+ iframeStyle.setProperty('transform', `translate(${x}px, ${y}px)`, 'important')
iframeStyle.setProperty('opacity', opacity, 'important')
}
return null
@@ -147,9 +147,19 @@ export default class DictPanelPortal extends React.Component<DictPanelPortalProp
const dictHeights = this.state.mutableArea.dictHeights
if (dictHeights[id] !== height) {
dictHeights[id] = height
- const newHeight = 30 + this.props.config.dicts.selected
- .reduce((sum, id) => sum + (dictHeights[id] || 30), 0)
- this.setState({ height: newHeight })
+
+ const winHeight = window.innerHeight
+ const newHeight = Math.min(
+ winHeight * this.props.config.panelMaxHeightRatio,
+ 30 + this.props.config.dicts.selected
+ .reduce((sum, id) => sum + (dictHeights[id] || 30), 0),
+ )
+
+ if (this.state.y + newHeight + 10 > winHeight) {
+ this.setState({ height: newHeight, y: winHeight - 10 - newHeight })
+ } else {
+ this.setState({ height: newHeight })
+ }
}
}
|
feat
|
supprot max height
|
b8daad25b6608c5c651ec78fddae39682dd554fd
|
2020-05-30 00:42:33
|
crimx
|
refactor(panel): add border radius
| false
|
diff --git a/src/content/components/DictPanel/DictPanel.scss b/src/content/components/DictPanel/DictPanel.scss
index e8af57f3b..008ce1c2d 100644
--- a/src/content/components/DictPanel/DictPanel.scss
+++ b/src/content/components/DictPanel/DictPanel.scss
@@ -11,6 +11,7 @@
left: 0;
overflow: hidden;
text-align: initial;
+ border-radius: 6px;
box-shadow: rgba(0, 0, 0, 0.8) 0px 4px 23px -6px;
}
diff --git a/src/content/components/DictPanel/DictPanelStandalone.scss b/src/content/components/DictPanel/DictPanelStandalone.scss
index 81fbd219f..a251086a4 100644
--- a/src/content/components/DictPanel/DictPanelStandalone.scss
+++ b/src/content/components/DictPanel/DictPanelStandalone.scss
@@ -8,6 +8,7 @@
height: 500px;
--panel-width: 450px;
--panel-max-height: 500px;
+ border-radius: 0;
box-shadow: rgba(0, 0, 0, 0.8) 0px 5px 20px -12px;
&.isAnimate {
diff --git a/src/content/components/MenuBar/MenuBar.scss b/src/content/components/MenuBar/MenuBar.scss
index 3afae1cdb..9300f0d15 100644
--- a/src/content/components/MenuBar/MenuBar.scss
+++ b/src/content/components/MenuBar/MenuBar.scss
@@ -7,6 +7,7 @@
align-items: center;
position: relative;
height: 30px;
+ padding: 0 3px;
font-size: 14px;
background-color: var(--color-brand);
}
|
refactor
|
add border radius
|
929b37240f2893245cf3e8f049825c622a710f7d
|
2020-01-24 08:07:39
|
crimx
|
chore: update ff pack script
| false
|
diff --git a/scripts/after-build.js b/scripts/after-build.js
index 5c9976fdc..2f77c0d2f 100644
--- a/scripts/after-build.js
+++ b/scripts/after-build.js
@@ -1,5 +1,16 @@
const fs = require('fs-extra')
const path = require('path')
-// FF policy
-fs.remove(path.join(__dirname, '../build/firefox/assets/fanyi.youdao.2.0'))
+main()
+
+async function main() {
+ // FF policy
+ await fs.remove(
+ path.join(__dirname, '../build/firefox/assets/fanyi.youdao.2.0')
+ )
+ // Stop FF extension check errors
+ await fs.outputFile(
+ path.join(__dirname, '../build/firefox/assets/fanyi.youdao.2.0/main.js'),
+ ''
+ )
+}
|
chore
|
update ff pack script
|
dff562de796b917451628683864fd1bd13f1b6ae
|
2018-11-03 19:06:04
|
CRIMX
|
fix(panel): fix suggests panel logic
| false
|
diff --git a/src/content/components/MenuBar/index.tsx b/src/content/components/MenuBar/index.tsx
index 6bcedc653..42fe3b976 100644
--- a/src/content/components/MenuBar/index.tsx
+++ b/src/content/components/MenuBar/index.tsx
@@ -115,30 +115,31 @@ export default class MenuBar extends React.PureComponent<MenuBarProps, MenuBarSt
handleSearchBoxKeyUp = (e: React.KeyboardEvent<HTMLInputElement>) => {
if (e.key === 'Enter') {
this.searchText()
- if (this.props.searchSuggests) {
- this.setState({ isShowSuggestPanel: false })
- }
- }
- }
-
- handleSearchBoxBlur = () => {
- if (this.props.searchSuggests) {
- this.setState({ isShowSuggestPanel: false })
+ this.hideSuggests()
}
}
handleIconSearchClick = (e: React.MouseEvent<HTMLButtonElement>) => {
e.currentTarget.blur()
this.searchText()
- if (this.props.searchSuggests) {
- this.setState({ isShowSuggestPanel: false })
- }
+ this.hideSuggests()
}
handleSuggestsItemClick = (e: React.MouseEvent<HTMLButtonElement>) => {
+ e.currentTarget.blur()
this.searchText(e.currentTarget.dataset.entry)
}
+ showSuggests = () => {
+ if (this.props.searchSuggests) {
+ this.setState({ isShowSuggestPanel: true })
+ }
+ }
+
+ hideSuggests = () => {
+ this.setState({ isShowSuggestPanel: false })
+ }
+
handleIconSettingsClick = (e: React.MouseEvent<HTMLButtonElement>) => {
e.currentTarget.blur()
const msg: MsgOpenUrl = {
@@ -320,6 +321,8 @@ export default class MenuBar extends React.PureComponent<MenuBarProps, MenuBarSt
<li key={s.entry} className='panel-MenuBar_SuggestsItem'>
<button className='panel-MenuBar_SuggestsBtn'
onClick={this.handleSuggestsItemClick}
+ onFocus={this.showSuggests}
+ onBlur={this.hideSuggests}
data-entry={s.entry}
>
<span className='panel-MenuBar_SuggestsEntry'>{s.entry}</span>
@@ -378,6 +381,7 @@ export default class MenuBar extends React.PureComponent<MenuBarProps, MenuBarSt
searchHistory,
searchBoxIndex,
searchBoxText,
+ searchSuggests,
} = this.props
const {
@@ -421,14 +425,14 @@ export default class MenuBar extends React.PureComponent<MenuBarProps, MenuBarSt
ref={this.inputRef}
onChange={this.handleSearchBoxInput}
onKeyUp={this.handleSearchBoxKeyUp}
- onBlur={this.handleSearchBoxBlur}
+ onBlur={this.hideSuggests}
value={searchBoxText.replace(/\s+/g, ' ')}
/>
<div>
<CSSTransition
classNames='panel-MenuBar_SuggestPanel'
- in={isShowSuggestPanel}
+ in={searchSuggests && isShowSuggestPanel}
timeout={100}
unmountOnExit={true}
>{this.renderSuggestsPanel}</CSSTransition>
|
fix
|
fix suggests panel logic
|
aaeae1cc6f4ea9ad43e2042b8b670f8480aaefb1
|
2021-05-15 11:49:07
|
crimx
|
fix(dict-panel): move root el to document element
| false
|
diff --git a/src/components/ShadowPortal/index.tsx b/src/components/ShadowPortal/index.tsx
index 5534ece88..25598ac9f 100644
--- a/src/components/ShadowPortal/index.tsx
+++ b/src/components/ShadowPortal/index.tsx
@@ -77,7 +77,7 @@ export const ShadowPortal = (props: ShadowPortalProps) => {
{...restProps}
onEnter={(...args) => {
if (!$root.parentNode) {
- document.body.appendChild($root)
+ document.documentElement.appendChild($root)
}
if (onEnter) {
return onEnter(...args)
|
fix
|
move root el to document element
|
8faf50ca7df399d1c4fef7b9966769b566b201bf
|
2019-08-26 18:12:24
|
crimx
|
refactor(selection): finish selection
| false
|
diff --git a/src/content/__fake__/env-instant-capture.ts b/src/content/__fake__/env-instant-capture.ts
index 2331e8692..418003636 100644
--- a/src/content/__fake__/env-instant-capture.ts
+++ b/src/content/__fake__/env-instant-capture.ts
@@ -1,13 +1,11 @@
import { createIntantCaptureStream } from '@/selection/instant-capture'
import getDefaultConfig, { AppConfigMutable, AppConfig } from '@/app-config'
-import { Subject } from 'rxjs'
+import { of } from 'rxjs'
const config = getDefaultConfig() as AppConfigMutable
config.mode.instant.enable = true
config.mode.instant.key = 'ctrl'
-const input$$ = new Subject<Readonly<[AppConfig, boolean, boolean]>>()
-
-createIntantCaptureStream(input$$).subscribe(console.log)
-
-input$$.next([config, false, false] as const)
+createIntantCaptureStream(of(config), of(false), of(false)).subscribe(
+ console.log
+)
diff --git a/src/content/__fake__/env-select-text.ts b/src/content/__fake__/env-select-text.ts
new file mode 100644
index 000000000..bb88bbf0a
--- /dev/null
+++ b/src/content/__fake__/env-select-text.ts
@@ -0,0 +1,10 @@
+import { createSelectTextStream } from '@/selection/select-text'
+import getDefaultConfig from '@/app-config'
+import { of } from 'rxjs'
+import { createMousedownStream } from '@/selection/mouse-events'
+
+const config = getDefaultConfig()
+
+createSelectTextStream(of(config), createMousedownStream()).subscribe(
+ console.log
+)
diff --git a/src/content/__fake__/env.ts b/src/content/__fake__/env.ts
index efda4885c..8abe9a6a7 100644
--- a/src/content/__fake__/env.ts
+++ b/src/content/__fake__/env.ts
@@ -1,3 +1,5 @@
+import './env-instant-capture'
+import './env-select-text'
import faker from 'faker'
for (let i = 0; i < 10; i++) {
diff --git a/src/selection/helper.ts b/src/selection/helper.ts
index dcaabdb69..e96fde417 100644
--- a/src/selection/helper.ts
+++ b/src/selection/helper.ts
@@ -18,7 +18,7 @@ export function isEscapeKey(evt: KeyboardEvent): boolean {
return evt.key === 'Escape'
}
-export function isKeyPressed(
+export function whenKeyPressed(
keySelectior: (e: KeyboardEvent) => boolean
): Observable<true> {
return merge(
diff --git a/src/selection/index.ts b/src/selection/index.ts
index b1efaea9b..4bf4cc452 100644
--- a/src/selection/index.ts
+++ b/src/selection/index.ts
@@ -1,186 +1,126 @@
+import { getText, getSentence } from 'get-selection-more'
+import { AppConfig } from '@/app-config'
import { message } from '@/_helpers/browser-api'
-import * as selection from '@/_helpers/selection'
-import { checkSupportedLangs } from '@/_helpers/lang-check'
-import { Mutable } from '@/typings/helpers'
-import { MsgType, PostMsgType, PostMsgSelection } from '@/typings/message'
+import { newWord } from '@/_helpers/record-manager'
+import { createConfigStream } from '@/_helpers/config-manager'
+import { isInDictPanel } from '@/_helpers/saladict'
-import { lastMousedown$$, validMouseup$$, clickPeriodCount$ } from './mouse-events'
-import {
- isTypeField,
- sendMessage,
- sendEmptyMessage,
- isQSKey,
- isEscapeKey,
- isKeyPressed,
- isInPanelOnInternalPage,
- config$$,
-} from './helper'
-import './instant-capture'
-
-import { merge } from 'rxjs/observable/merge'
-import { map } from 'rxjs/operators/map'
-import { take } from 'rxjs/operators/take'
-import { share } from 'rxjs/operators/share'
-import { buffer } from 'rxjs/operators/buffer'
-import { filter } from 'rxjs/operators/filter'
-import { debounceTime } from 'rxjs/operators/debounceTime'
-import { withLatestFrom } from 'rxjs/operators/withLatestFrom'
-import { distinctUntilChanged } from 'rxjs/operators/distinctUntilChanged'
+import { merge, from } from 'rxjs'
+import { share, pluck, startWith, withLatestFrom } from 'rxjs/operators'
-const isSaladictInternalPage = !!window.__SALADICT_INTERNAL_PAGE__
-const isSaladictOptionsPage = !!window.__SALADICT_OPTIONS_PAGE__
-const isSaladictPopupPage = !!window.__SALADICT_POPUP_PAGE__
-const isNoSelectionPage = isSaladictOptionsPage || isSaladictPopupPage
+import { postMessageHandler, sendMessage, sendEmptyMessage } from './message'
+import { isEscapeKey, whenKeyPressed } from './helper'
+import { createIntantCaptureStream } from './instant-capture'
+import { createQuickSearchStream } from './quick-search'
+import { createSelectTextStream } from './select-text'
+import { createMousedownStream } from './mouse-events'
-interface PostMessageEvent extends MessageEvent {
- data: PostMsgSelection
-}
+const config$$ = share<AppConfig>()(createConfigStream())
+const mousedown$$ = createMousedownStream()
/**
+ * Send selection to standalone page
* Beware that this is run on every frame.
*/
-message.addListener(msg => {
- switch (msg.type) {
- case MsgType.PreloadSelection:
- if (selection.getSelectionText()) {
- return Promise.resolve(selection.getSelectionInfo())
- }
- break
- case MsgType.EmitSelection:
- let isSent = false
- lastMousedown$$.pipe(take(1)).subscribe(lastMousedownEvent => {
- if (lastMousedownEvent) {
- const text = selection.getSelectionText()
- if (text) {
- const { clientX, clientY } = lastMousedownEvent instanceof MouseEvent
- ? lastMousedownEvent
- : lastMousedownEvent.changedTouches[0]
- sendMessage({
- mouseX: clientX,
- mouseY: clientY,
- instant: true,
- self: isSaladictInternalPage
- ? isInPanelOnInternalPage(lastMousedownEvent)
- : window.name === 'saladict-dictpanel',
- selectionInfo: selection.getSelectionInfo({ text }),
- })
- isSent = true
- }
- }
+message.addListener('PRELOAD_SELECTION', () => {
+ const text = getText()
+ if (text) {
+ return Promise.resolve(
+ newWord({
+ text,
+ context: getSentence()
})
- // Only returns when there is a match, otherwise leave it to other frames.
- if (isSent) { return Promise.resolve() }
- break
- default:
- break
+ )
}
})
-/** Pass through message from iframes */
-window.addEventListener('message', ({ data, source }: PostMessageEvent) => {
- if (data.type !== PostMsgType.Selection) { return }
-
- // get the souce iframe
- const matchSrc = ({ contentWindow }: HTMLIFrameElement | HTMLFrameElement) =>
- contentWindow === source
- const frame = (
- Array.from(document.querySelectorAll('iframe')).find(matchSrc) ||
- Array.from(document.querySelectorAll('frame')).find(matchSrc)
- )
- if (!frame) { return }
-
- const { left, top } = frame.getBoundingClientRect()
- const msg: Mutable<typeof data> = data
- msg.mouseX = msg.mouseX + left
- msg.mouseY = msg.mouseY + top
- sendMessage(msg)
-})
-
/**
- * Escape key pressed
+ * Manualy emit selection
+ * Beware that this is run on every frame.
*/
-isKeyPressed(isEscapeKey).subscribe(
- () => message.self.send({ type: MsgType.EscapeKey })
-)
-
-if (!window.name.startsWith('saladict-') && !isSaladictOptionsPage) {
- /**
- * Pressing ctrl/command key more than three times within 500ms
- * trigers TripleCtrl
- */
- const qsKeyPressed$$ = share<true>()(isKeyPressed(isQSKey))
-
- qsKeyPressed$$.pipe(
- buffer(merge(
- debounceTime(500)(qsKeyPressed$$), // collect after 0.5s
- isKeyPressed(e => !isQSKey(e)), // other key pressed
- )),
- filter(group => group.length >= 3),
- withLatestFrom(config$$),
- ).subscribe(args => {
- if (args[1].tripleCtrl) {
- message.self.send({ type: MsgType.TripleCtrl })
+message
+ .createStream('EMIT_SELECTION')
+ .pipe(withLatestFrom(mousedown$$))
+ .subscribe(([, event]) => {
+ if (event) {
+ const text = getText()
+ if (text) {
+ const { clientX, clientY } =
+ event instanceof MouseEvent ? event : event.changedTouches[0]
+ sendMessage({
+ mouseX: clientX,
+ mouseY: clientY,
+ instant: true,
+ self: isInDictPanel(event.target),
+ word: newWord({ text, context: getSentence() }),
+ dbClick: false,
+ shiftKey: Boolean(event['shiftKey']),
+ ctrlKey: Boolean(event['ctrlKey']),
+ metaKey: Boolean(event['metaKey']),
+ force: false
+ })
+ }
}
})
-}
-validMouseup$$.pipe(
- withLatestFrom(lastMousedown$$, clickPeriodCount$),
- filter(([[event, config], lastMousedownEvent]) => {
- if (isNoSelectionPage && !isInPanelOnInternalPage(lastMousedownEvent)) {
- return false
- }
+/** Pass through message from iframes */
+window.addEventListener('message', postMessageHandler)
- if (config.noTypeField && isTypeField(lastMousedownEvent)) {
- const isDictPanel = isSaladictInternalPage
- ? isInPanelOnInternalPage(lastMousedownEvent)
- : window.name === 'saladict-dictpanel'
- sendEmptyMessage(isDictPanel)
- return false
- }
+/**
+ * Escape key pressed
+ */
+whenKeyPressed(isEscapeKey).subscribe(() =>
+ message.self.send({ type: 'ESCAPE_KEY' })
+)
- return true
- }),
- map(args => {
- return [
- args,
- {
- text: selection.getSelectionText(),
- context: selection.getSelectionSentence(),
- },
- ] as [typeof args, { text: string, context: string }]
- }),
- distinctUntilChanged((oldVal, newVal) => {
- const clickPeriodCount = newVal[0][2]
- // (Ignore this rule if it is a double click.)
- // Same selection. This could be caused by other widget on the page
- // that uses preventDefault which stops selection being cleared when clicked.
- // Ignore it so that the panel won't follow.
- return Boolean(
- clickPeriodCount < 2 &&
- oldVal[1].text &&
- oldVal[1].text === newVal[1].text &&
- oldVal[1].context &&
- oldVal[1].context === newVal[1].context
- )
- })
-).subscribe(([[[event, config], lastMousedownEvent, clickPeriodCount], partialSelInfo]) => {
- const isDictPanel = isSaladictInternalPage
- ? isInPanelOnInternalPage(lastMousedownEvent)
- : window.name === 'saladict-dictpanel'
+createQuickSearchStream(config$$).subscribe(() => {
+ message.self.send({ type: 'TRIPLE_CTRL' })
+})
- if (checkSupportedLangs(config.language, partialSelInfo.text)) {
+createSelectTextStream(config$$, mousedown$$).subscribe(result => {
+ if (typeof result === 'boolean') {
+ sendEmptyMessage(result)
+ } else {
sendMessage({
- mouseX: event.clientX,
- mouseY: event.clientY,
- dbClick: clickPeriodCount >= 2,
- shiftKey: Boolean(event['shiftKey']),
- ctrlKey: Boolean(event['ctrlKey']),
- metaKey: Boolean(event['metaKey']),
- self: isDictPanel,
- selectionInfo: selection.getSelectionInfo(partialSelInfo)
+ mouseX: result.event.clientX,
+ mouseY: result.event.clientY,
+ dbClick: result.clickCount >= 2,
+ shiftKey: Boolean(result.event['shiftKey']),
+ ctrlKey: Boolean(result.event['ctrlKey']),
+ metaKey: Boolean(result.event['metaKey']),
+ self: result.self,
+ word: newWord({ text: result.text, context: result.context }),
+ instant: false,
+ force: false
})
- } else {
- sendEmptyMessage(isDictPanel)
}
})
+
+createIntantCaptureStream(
+ config$$,
+ message.self.createStream('PIN_STATE').pipe(
+ pluck('payload'),
+ startWith(false)
+ ),
+ merge(
+ // When Quick Search Panel show and hide
+ from(message.send<'QUERY_QS_PANEL'>({ type: 'QUERY_QS_PANEL' })),
+ message.createStream('QS_PANEL_CHANGED').pipe(
+ pluck('payload'),
+ startWith(false)
+ )
+ )
+).subscribe(({ word, event, self }) => {
+ sendMessage({
+ word,
+ shiftKey: event.shiftKey,
+ ctrlKey: event.ctrlKey,
+ metaKey: event.metaKey,
+ dbClick: false,
+ force: false,
+ instant: true,
+ mouseX: event.clientX,
+ mouseY: event.clientY,
+ self
+ })
+})
diff --git a/src/selection/instant-capture.ts b/src/selection/instant-capture.ts
index 4ed97ac45..ca351ee5c 100644
--- a/src/selection/instant-capture.ts
+++ b/src/selection/instant-capture.ts
@@ -1,10 +1,11 @@
import { getText, getSentence } from 'get-selection-more'
+import { DeepNonNullable } from 'utility-types'
import { AppConfig } from '@/app-config'
import { isStandalonePage, isInDictPanel } from '@/_helpers/saladict'
import { checkSupportedLangs } from '@/_helpers/lang-check'
import { Word, newWord } from '@/_helpers/record-manager'
-import { fromEvent, merge, of, Observable, timer } from 'rxjs'
+import { fromEvent, merge, of, Observable, timer, combineLatest } from 'rxjs'
import {
map,
mapTo,
@@ -18,13 +19,13 @@ import { isBlacklisted } from './helper'
/**
* Create an instant capture Observable
- * @param input$ Observable of app config,
- * is panel pinned, and is the Quick Search Panel showing.
*/
export function createIntantCaptureStream(
- input$: Observable<Readonly<[AppConfig, boolean, boolean]>>
+ config$: Observable<AppConfig>,
+ isPinned$: Observable<boolean>,
+ withQSPanel$: Observable<boolean>
) {
- return input$.pipe(
+ return combineLatest(config$, isPinned$, withQSPanel$).pipe(
switchMap(([config, isPinned, withQSPanel]) => {
if (isBlacklisted(config)) return of(null)
@@ -38,8 +39,12 @@ export function createIntantCaptureStream(
}
// Reduce GC
- // Only the latest result is used so it's safe to reuse the array
- const reuseTuple = ([] as unknown) as [MouseEvent, AppConfig, boolean]
+ // Only the latest result is used so it's safe to reuse the object
+ const reuseObj = ({} as unknown) as {
+ event: MouseEvent
+ config: AppConfig
+ self: boolean
+ }
return merge(
mapTo(null)(fromEvent(window, 'mouseup', { capture: true })),
@@ -57,36 +62,38 @@ export function createIntantCaptureStream(
(instant.key === 'direct' &&
!(event.ctrlKey || event.metaKey || event.altKey))
) {
- reuseTuple[0] = event
- reuseTuple[1] = config
- reuseTuple[2] = self
- return reuseTuple
+ reuseObj.event = event
+ reuseObj.config = config
+ reuseObj.self = self
+ return reuseObj
}
}
return null
})
)
).pipe(
- debounce(arg =>
- arg ? timer(arg[2] ? panelInstant.delay : otherInstant.delay) : of()
+ debounce(obj =>
+ obj ? timer(obj.self ? panelInstant.delay : otherInstant.delay) : of()
)
)
}),
- map(
- args =>
- args &&
- ([getCursorWord(args[0]), ...args] as
- | null
- | [Word | null, MouseEvent, AppConfig, boolean])
- ),
- filter((args): args is [Word, MouseEvent, AppConfig, boolean] =>
+ map(obj => obj && { word: getCursorWord(obj.event), ...obj }),
+ filter((obj): obj is {
+ word: Word
+ event: MouseEvent
+ config: AppConfig
+ self: boolean
+ } =>
Boolean(
- args && args[0] && checkSupportedLangs(args[2].language, args[0].text)
+ obj &&
+ obj.word &&
+ checkSupportedLangs(obj.config.language, obj.word.text)
)
),
distinctUntilChanged(
- ([oldWord], [newWord]) =>
- oldWord.text === newWord.text && oldWord.context === newWord.context
+ (oldObj, newObj) =>
+ oldObj.word.text === newObj.word.text &&
+ oldObj.word.context === newObj.word.context
)
)
}
diff --git a/src/selection/message.ts b/src/selection/message.ts
index ddfb7e1f1..2888fdb97 100644
--- a/src/selection/message.ts
+++ b/src/selection/message.ts
@@ -1,4 +1,3 @@
-import { newWord } from '@/_helpers/record-manager'
import { Message } from '@/typings/message'
import { message } from '@/_helpers/browser-api'
@@ -9,7 +8,7 @@ interface PostMessageEvent extends MessageEvent {
}
}
-export function messageHandler({ data, source }: PostMessageEvent) {
+export function postMessageHandler({ data, source }: PostMessageEvent) {
if (!data || data.type !== 'SALADICT_SELECTION') {
return
}
@@ -67,7 +66,7 @@ export function sendEmptyMessage(isDictPanel: boolean) {
const msg: Message<'SELECTION'> = {
type: 'SELECTION',
payload: {
- word: newWord(),
+ word: null,
self: isDictPanel,
mouseX: 0,
mouseY: 0,
diff --git a/src/selection/mouse-events.ts b/src/selection/mouse-events.ts
index 7324cb6d3..b123461cb 100644
--- a/src/selection/mouse-events.ts
+++ b/src/selection/mouse-events.ts
@@ -1,5 +1,5 @@
import { AppConfig } from '@/app-config'
-import { isInSaladict } from '@/_helpers/saladict'
+import { isInSaladictExternal } from '@/_helpers/saladict'
import { fromEvent, merge, timer, of, Observable } from 'rxjs'
import {
@@ -20,7 +20,7 @@ import { isBlacklisted } from './helper'
/**
* Track the last mousedown target for identifying input field, if needed.
*/
-export function getMousedown$$() {
+export function createMousedownStream() {
return merge(
fromEvent<MouseEvent>(window, 'mousedown', { capture: true }),
fromEvent<TouchEvent>(window, 'touchstart', { capture: true }),
@@ -38,7 +38,7 @@ export function getMousedown$$() {
* 2. Event target is not a Saladict exposed element.
* 3. Site url is not blacked.
*/
-export function getValidMouseup$$(config$: Observable<AppConfig>) {
+export function createValidMouseupStream(config$: Observable<AppConfig>) {
return merge(
fromEvent<MouseEvent>(window, 'mouseup', { capture: true }).pipe(
filter(e => e.button === 0)
@@ -49,7 +49,7 @@ export function getValidMouseup$$(config$: Observable<AppConfig>) {
).pipe(
withLatestFrom(config$),
filter(([event, config]) => {
- if (isInSaladict(event.target)) {
+ if (isInSaladictExternal(event.target)) {
return false
}
if (isBlacklisted(config)) {
@@ -57,9 +57,9 @@ export function getValidMouseup$$(config$: Observable<AppConfig>) {
}
return true
}),
- // if user click on a selected text,
- // getSelection would return the text before the highlight disappears
- // delay to wait for selection get cleared
+ // if user clicks on a selected text,
+ // getSelection would return the text before the highlight disappears.
+ // Delay to wait for selection being cleared.
delay(10),
share()
)
@@ -68,8 +68,8 @@ export function getValidMouseup$$(config$: Observable<AppConfig>) {
/**
* Count mouse click within a period
*/
-export function getClickPeriodCount$(
- validMouseup$: Observable<[MouseEvent | TouchEvent, AppConfig]>
+export function createClickPeriodCountStream(
+ validMouseup$: ReturnType<typeof createValidMouseupStream>
) {
return merge(
mapTo(true)(validMouseup$),
diff --git a/src/selection/quick-search.ts b/src/selection/quick-search.ts
new file mode 100644
index 000000000..1c911ca32
--- /dev/null
+++ b/src/selection/quick-search.ts
@@ -0,0 +1,44 @@
+import { Observable, empty, merge } from 'rxjs'
+import { AppConfig } from '@/app-config'
+import { isStandalonePage, isOptionsPage } from '@/_helpers/saladict'
+import {
+ distinctUntilChanged,
+ switchMap,
+ share,
+ buffer,
+ debounceTime,
+ filter
+} from 'rxjs/operators'
+import { whenKeyPressed, isQSKey } from './helper'
+
+/**
+ * Listen to triple-ctrl shortcut which opens quick search panel.
+ * Pressing ctrl/command key more than three times within 500ms
+ * trigers triple-ctrl.
+ */
+export function createQuickSearchStream(config$: Observable<AppConfig>) {
+ if (isStandalonePage() || isOptionsPage()) {
+ return empty()
+ }
+
+ return config$.pipe(
+ distinctUntilChanged(
+ (oldConfig, newConfig) => oldConfig.tripleCtrl === newConfig.tripleCtrl
+ ),
+ switchMap(({ tripleCtrl }) => {
+ if (!tripleCtrl) return empty()
+
+ const qsKeyPressed$$ = share<true>()(whenKeyPressed(isQSKey))
+
+ return qsKeyPressed$$.pipe(
+ buffer(
+ merge(
+ debounceTime(500)(qsKeyPressed$$), // collect after 0.5s
+ whenKeyPressed(e => !isQSKey(e)) // other key pressed
+ )
+ ),
+ filter(group => group.length >= 3)
+ )
+ })
+ )
+}
diff --git a/src/selection/select-text.ts b/src/selection/select-text.ts
new file mode 100644
index 000000000..13c2e0665
--- /dev/null
+++ b/src/selection/select-text.ts
@@ -0,0 +1,72 @@
+import { Observable, empty, of } from 'rxjs'
+import {
+ withLatestFrom,
+ filter,
+ map,
+ distinctUntilChanged,
+ mergeMap
+} from 'rxjs/operators'
+import { AppConfig } from '@/app-config'
+import {
+ createValidMouseupStream,
+ createClickPeriodCountStream,
+ createMousedownStream
+} from './mouse-events'
+import { isTypeField } from './helper'
+import { isInDictPanel, isStandalonePage } from '@/_helpers/saladict'
+import { getText, getSentence } from 'get-selection-more'
+import { checkSupportedLangs } from '@/_helpers/lang-check'
+
+export function createSelectTextStream(
+ config$: Observable<AppConfig>,
+ lastMousedown$: Observable<MouseEvent | TouchEvent | null>
+) {
+ if (isStandalonePage()) {
+ return empty()
+ }
+
+ const validMouseup$$ = createValidMouseupStream(config$)
+ const clickPeriodCount$ = createClickPeriodCountStream(validMouseup$$)
+
+ return validMouseup$$.pipe(
+ withLatestFrom(lastMousedown$, clickPeriodCount$),
+ mergeMap(([[mouseup, config], mousedown, clickCount]) => {
+ const self = isInDictPanel(mousedown && mousedown.target)
+
+ if (config.noTypeField && isTypeField(mousedown)) {
+ return of(self)
+ }
+
+ const text = getText()
+
+ if (!checkSupportedLangs(config.language, text)) {
+ return of(self)
+ }
+
+ return of({
+ text,
+ context: getSentence(),
+ clickCount,
+ event: mouseup,
+ self
+ })
+ }),
+ distinctUntilChanged((oldVal, newVal) =>
+ Boolean(
+ // Always different if selection no valid
+ typeof oldVal !== 'boolean' &&
+ typeof newVal !== 'boolean' &&
+ // Always different if double click.
+ newVal.clickCount < 2 &&
+ // Always different if no selection
+ oldVal.text &&
+ oldVal.context &&
+ // Same selection. This could be caused by other widget on the page
+ // that uses preventDefault which stops selection being cleared when clicked.
+ // Ignore it so that the panel won't follow.
+ oldVal.text === newVal.text &&
+ oldVal.context === newVal.context
+ )
+ )
+ )
+}
diff --git a/src/typings/message.ts b/src/typings/message.ts
index 3d054b78c..fcb996a67 100644
--- a/src/typings/message.ts
+++ b/src/typings/message.ts
@@ -152,7 +152,7 @@ export type MessageConfig = {
/** To dict panel */
SELECTION: {
payload: {
- word: Word
+ word: Word | null
mouseX: number
mouseY: number
dbClick: boolean
|
refactor
|
finish selection
|
3d77d9733ebb0484283cbdee59ca098fc4feca61
|
2019-10-06 16:39:48
|
Kay
|
fix(panel): save word without confirm (#500)
| false
|
diff --git a/src/content/components/WordEditor/WordEditorPanel.tsx b/src/content/components/WordEditor/WordEditorPanel.tsx
index ff4b43915..b71046929 100644
--- a/src/content/components/WordEditor/WordEditorPanel.tsx
+++ b/src/content/components/WordEditor/WordEditorPanel.tsx
@@ -226,7 +226,7 @@ export const WordEditorPanel: FC<WordEditorPanelProps> = props => {
className="wordEditor-Note_BtnSave"
onClick={() =>
saveWord('notebook', word)
- .then(closeEditor)
+ .then(props.onClose)
.catch(console.error)
}
>
|
fix
|
save word without confirm (#500)
|
703d646c991fbf4386ac073e482fc032b45ad42a
|
2019-08-10 16:35:09
|
crimx
|
refactor: word editor
| false
|
diff --git a/package.json b/package.json
index e483febe1..37fc36d1f 100644
--- a/package.json
+++ b/package.json
@@ -77,6 +77,7 @@
"@storybook/addon-contexts": "^5.1.9",
"@storybook/addon-knobs": "^5.1.9",
"@storybook/react": "^5.1.9",
+ "@types/faker": "^4.1.5",
"@types/sinon-chrome": "^2.2.6",
"@types/storybook__addon-knobs": "^5.0.2",
"@types/storybook__react": "^4.0.2",
@@ -96,6 +97,7 @@
"eslint-plugin-promise": "^4.2.1",
"eslint-plugin-react": "^7.14.2",
"eslint-plugin-standard": "^4.0.0",
+ "faker": "^4.1.0",
"husky": "^3.0.0",
"jest": "^24.8.0",
"neutrino": "^9.0.0-rc.3",
diff --git a/src/content/components/WordCards/index.tsx b/src/content/components/WordCards/index.tsx
deleted file mode 100644
index f1a7a1016..000000000
--- a/src/content/components/WordCards/index.tsx
+++ /dev/null
@@ -1,70 +0,0 @@
-import React from 'react'
-import { translate } from 'react-i18next'
-import { TranslationFunction } from 'i18next'
-import { Word } from '@/_helpers/record-manager'
-
-export interface WordCardsProps {
- words: Word[]
- deleteCard: (word: Word) => any
-}
-
-export class WordCards extends React.PureComponent<WordCardsProps & { t: TranslationFunction }> {
- render () {
- const {
- t,
- words,
- deleteCard,
- } = this.props
-
- return (
- <aside className='wordCards'>
- <header>
- <h1 className='wordCards-Title'>{t('wordEditorWordCardsTitle')}</h1>
- </header>
- <ul className='wordCards-CardList'>
- {words.map(word => (
- <li className='wordCards-Card'
- key={word.date}
- >
- <button type='button' className='wordCards-CardClose' onClick={() => deleteCard(word)}>×</button>
- <h2 className='wordCards-CardTitle'>{word.text}</h2>
- {word.trans &&
- <div className='wordCards-CardItem'>
- <svg className='wordCards-CardItem_Icon' width='18' height='18' xmlns='http://www.w3.org/2000/svg' viewBox='0 0 469.333 469.333'>
- <title>{t('wordEditorNoteTrans')}</title>
- <path d='M253.227 300.267L199.04 246.72l.64-.64c37.12-41.387 63.573-88.96 79.147-139.307h62.507V64H192V21.333h-42.667V64H0v42.453h238.293c-14.4 41.173-36.907 80.213-67.627 114.347-19.84-22.08-36.267-46.08-49.28-71.467H78.72c15.573 34.773 36.907 67.627 63.573 97.28l-108.48 107.2L64 384l106.667-106.667 66.347 66.347 16.213-43.413zM373.333 192h-42.667l-96 256h42.667l24-64h101.333l24 64h42.667l-96-256zm-56 149.333L352 248.853l34.667 92.48h-69.334z'/>
- </svg>
- <span className='wordCards-CardItem_Cont'>{word.trans}</span>
- </div>
- }
- {word.context &&
- <div className='wordCards-CardItem'>
- <svg className='wordCards-CardItem_Icon' width='18' height='18' xmlns='http://www.w3.org/2000/svg' viewBox='0 0 95.333 95.332'>
- <title>{t('wordEditorNoteContext')}</title>
- <path d='M 36.587 45.263 C 35.07 44.825 33.553 44.605 32.078 44.605 C 29.799 44.605 27.898 45.125 26.423 45.763 C 27.844 40.559 31.259 31.582 38.061 30.57 C 38.69 30.476 39.207 30.021 39.379 29.408 L 40.864 24.09 C 40.99 23.641 40.916 23.16 40.66 22.77 C 40.403 22.38 39.991 22.119 39.529 22.056 C 39.027 21.987 38.515 21.952 38.009 21.952 C 29.844 21.952 21.759 30.474 18.347 42.675 C 16.344 49.833 15.757 60.595 20.686 67.369 C 23.445 71.16 27.472 73.183 32.657 73.385 L 32.717 73.386 C 39.114 73.386 44.783 69.079 46.508 62.915 C 47.538 59.229 47.073 55.364 45.196 52.029 C 43.338 48.731 40.28 46.327 36.581 45.263 Z M 76.615 52.029 C 74.758 48.731 71.699 46.327 68.002 45.263 C 66.484 44.823 64.968 44.604 63.492 44.604 C 61.214 44.604 59.311 45.121 57.838 45.76 C 59.259 40.553 62.673 31.579 69.475 30.564 C 70.102 30.47 70.619 30.016 70.793 29.402 L 72.28 24.085 C 72.403 23.635 72.332 23.155 72.073 22.764 C 71.814 22.373 71.401 22.113 70.942 22.049 C 70.438 21.981 69.928 21.946 69.417 21.946 C 61.253 21.946 53.169 30.467 49.755 42.669 C 47.752 49.827 47.166 60.59 52.101 67.364 C 54.858 71.153 58.887 73.178 64.069 73.379 C 64.091 73.38 64.111 73.381 64.134 73.381 C 70.527 73.381 76.198 69.074 77.923 62.908 C 78.953 59.224 78.485 55.358 76.609 52.022 Z' />
- </svg>
- <span className='wordCards-CardItem_Cont'>{word.context}</span>
- </div>
- }
- {word.note &&
- <div className='wordCards-CardItem'>
- <svg className='wordCards-CardItem_Icon' width='18' height='18' xmlns='http://www.w3.org/2000/svg' viewBox='0 0 35.738 35.738'>
- <title>{t('wordEditorNoteNote')}</title>
- <path d='M0 35.667S11.596-1.403 35.738.117c0 0-2.994 4.85-10.55 6.416 0 0 3.517.43 6.368-.522 0 0-1.71 5.517-11.025 6.275 0 0 5.135 1.33 7.416.57 0 0-.62 4.11-10.102 6.154-.562.12-4.347 1.066-1.306 1.447 0 0 4.37.763 5.514.38 0 0-3.743 5.608-12.927 5.133-.903-.048-1.332 0-1.332 0L0 35.666z' />
- </svg>
- <span className='wordCards-CardItem_Cont'>{word.note}</span>
- </div>
- }
- <div className='wordCards-CardFooter'>
- {word.favicon && <img className='wordCards-Favicon' src={word.favicon} />}
- <a className='wordCards-URL' href={word.url} target='_blank' rel='nofollow noopener noreferrer' title={word.title}>{word.title}</a>
- </div>
- </li>
- ))}
- </ul>
- </aside>
- )
- }
-}
-
-export default translate()(WordCards)
diff --git a/src/content/components/WordCards/_style.scss b/src/content/components/WordEditor/WordCards.scss
similarity index 100%
rename from src/content/components/WordCards/_style.scss
rename to src/content/components/WordEditor/WordCards.scss
diff --git a/src/content/components/WordEditor/WordCards.tsx b/src/content/components/WordEditor/WordCards.tsx
new file mode 100644
index 000000000..6d0d07833
--- /dev/null
+++ b/src/content/components/WordEditor/WordCards.tsx
@@ -0,0 +1,97 @@
+import React, { FC } from 'react'
+import { Word } from '@/_helpers/record-manager'
+import { useTranslate } from '@/_helpers/i18n'
+
+export interface WordCardsProps {
+ words: Word[]
+ onCardDelete: (word: Word) => any
+}
+
+export const WordCards: FC<WordCardsProps> = ({ words, onCardDelete }) => {
+ const { t } = useTranslate(['common', 'content'])
+
+ return (
+ <aside className="wordCards">
+ <header>
+ <h1 className="wordCards-Title">
+ {t('content:wordEditor.wordCardsTitle')}
+ </h1>
+ </header>
+ <ul className="wordCards-CardList">
+ {words.map(word => (
+ <li className="wordCards-Card" key={word.date}>
+ <button
+ type="button"
+ className="wordCards-CardClose"
+ onClick={() => onCardDelete(word)}
+ >
+ ×
+ </button>
+ <h2 className="wordCards-CardTitle">{word.text}</h2>
+ {word.trans && (
+ <div className="wordCards-CardItem">
+ <svg
+ className="wordCards-CardItem_Icon"
+ width="18"
+ height="18"
+ xmlns="http://www.w3.org/2000/svg"
+ viewBox="0 0 469.333 469.333"
+ >
+ <title>{t('note.trans')}</title>
+ <path d="M253.227 300.267L199.04 246.72l.64-.64c37.12-41.387 63.573-88.96 79.147-139.307h62.507V64H192V21.333h-42.667V64H0v42.453h238.293c-14.4 41.173-36.907 80.213-67.627 114.347-19.84-22.08-36.267-46.08-49.28-71.467H78.72c15.573 34.773 36.907 67.627 63.573 97.28l-108.48 107.2L64 384l106.667-106.667 66.347 66.347 16.213-43.413zM373.333 192h-42.667l-96 256h42.667l24-64h101.333l24 64h42.667l-96-256zm-56 149.333L352 248.853l34.667 92.48h-69.334z" />
+ </svg>
+ <span className="wordCards-CardItem_Cont">{word.trans}</span>
+ </div>
+ )}
+ {word.context && (
+ <div className="wordCards-CardItem">
+ <svg
+ className="wordCards-CardItem_Icon"
+ width="18"
+ height="18"
+ xmlns="http://www.w3.org/2000/svg"
+ viewBox="0 0 95.333 95.332"
+ >
+ <title>{t('note.context')}</title>
+ <path d="M 36.587 45.263 C 35.07 44.825 33.553 44.605 32.078 44.605 C 29.799 44.605 27.898 45.125 26.423 45.763 C 27.844 40.559 31.259 31.582 38.061 30.57 C 38.69 30.476 39.207 30.021 39.379 29.408 L 40.864 24.09 C 40.99 23.641 40.916 23.16 40.66 22.77 C 40.403 22.38 39.991 22.119 39.529 22.056 C 39.027 21.987 38.515 21.952 38.009 21.952 C 29.844 21.952 21.759 30.474 18.347 42.675 C 16.344 49.833 15.757 60.595 20.686 67.369 C 23.445 71.16 27.472 73.183 32.657 73.385 L 32.717 73.386 C 39.114 73.386 44.783 69.079 46.508 62.915 C 47.538 59.229 47.073 55.364 45.196 52.029 C 43.338 48.731 40.28 46.327 36.581 45.263 Z M 76.615 52.029 C 74.758 48.731 71.699 46.327 68.002 45.263 C 66.484 44.823 64.968 44.604 63.492 44.604 C 61.214 44.604 59.311 45.121 57.838 45.76 C 59.259 40.553 62.673 31.579 69.475 30.564 C 70.102 30.47 70.619 30.016 70.793 29.402 L 72.28 24.085 C 72.403 23.635 72.332 23.155 72.073 22.764 C 71.814 22.373 71.401 22.113 70.942 22.049 C 70.438 21.981 69.928 21.946 69.417 21.946 C 61.253 21.946 53.169 30.467 49.755 42.669 C 47.752 49.827 47.166 60.59 52.101 67.364 C 54.858 71.153 58.887 73.178 64.069 73.379 C 64.091 73.38 64.111 73.381 64.134 73.381 C 70.527 73.381 76.198 69.074 77.923 62.908 C 78.953 59.224 78.485 55.358 76.609 52.022 Z" />
+ </svg>
+ <span className="wordCards-CardItem_Cont">{word.context}</span>
+ </div>
+ )}
+ {word.note && (
+ <div className="wordCards-CardItem">
+ <svg
+ className="wordCards-CardItem_Icon"
+ width="18"
+ height="18"
+ xmlns="http://www.w3.org/2000/svg"
+ viewBox="0 0 35.738 35.738"
+ >
+ <title>{t('note.note')}</title>
+ <path d="M0 35.667S11.596-1.403 35.738.117c0 0-2.994 4.85-10.55 6.416 0 0 3.517.43 6.368-.522 0 0-1.71 5.517-11.025 6.275 0 0 5.135 1.33 7.416.57 0 0-.62 4.11-10.102 6.154-.562.12-4.347 1.066-1.306 1.447 0 0 4.37.763 5.514.38 0 0-3.743 5.608-12.927 5.133-.903-.048-1.332 0-1.332 0L0 35.666z" />
+ </svg>
+ <span className="wordCards-CardItem_Cont">{word.note}</span>
+ </div>
+ )}
+ <div className="wordCards-CardFooter">
+ {word.favicon && (
+ <img className="wordCards-Favicon" src={word.favicon} />
+ )}
+ <a
+ className="wordCards-URL"
+ href={word.url}
+ target="_blank"
+ rel="nofollow noopener noreferrer"
+ title={word.title}
+ >
+ {word.title}
+ </a>
+ </div>
+ </li>
+ ))}
+ </ul>
+ </aside>
+ )
+}
+
+export default WordCards
diff --git a/src/content/components/WordEditor/WordEditor.portal.tsx b/src/content/components/WordEditor/WordEditor.portal.tsx
new file mode 100644
index 000000000..4d7769808
--- /dev/null
+++ b/src/content/components/WordEditor/WordEditor.portal.tsx
@@ -0,0 +1,24 @@
+import React, { FC } from 'react'
+import { ShadowPortal, defaultTimeout } from '@/components/ShadowPortal'
+import { WordEditor, WordEditorProps } from './WordEditor'
+
+export interface WordEditorPortalProps extends WordEditorProps {
+ show: boolean
+ withAnimation: boolean
+}
+
+export const WordEditorPortal: FC<WordEditorPortalProps> = props => {
+ const { withAnimation, show, ...restProps } = props
+ return (
+ <ShadowPortal
+ id="saladict-wordeditor-root"
+ head={<style>{require('./WordEditor.shadow.scss').toString()}</style>}
+ in={show}
+ timeout={withAnimation ? defaultTimeout : 0}
+ >
+ {() => <WordEditor {...restProps} />}
+ </ShadowPortal>
+ )
+}
+
+export default WordEditorPortal
diff --git a/src/content/components/WordEditor/WordEditor.scss b/src/content/components/WordEditor/WordEditor.scss
new file mode 100644
index 000000000..e95174078
--- /dev/null
+++ b/src/content/components/WordEditor/WordEditor.scss
@@ -0,0 +1,20 @@
+@import './WordEditorPanel.scss';
+
+.wordEditor-Container {
+ position: fixed;
+ top: 0;
+ left: 0;
+ right: 0;
+ bottom: 0;
+ margin: auto;
+ background: rgba(0, 0, 0, 0.4);
+ display: flex;
+}
+
+.wordEditor-PanelContainer {
+ display: flex;
+ align-items: center;
+ height: 100%;
+ min-width: 440px;
+ margin-left: auto;
+}
diff --git a/src/content/components/WordEditor/WordEditor.shadow.scss b/src/content/components/WordEditor/WordEditor.shadow.scss
new file mode 100644
index 000000000..c8aba71cf
--- /dev/null
+++ b/src/content/components/WordEditor/WordEditor.shadow.scss
@@ -0,0 +1,2 @@
+@import './WordEditor.scss';
+@import '@/components/ShadowPortal/ShadowPortal.scss';
diff --git a/src/content/components/WordEditor/WordEditor.stories.tsx b/src/content/components/WordEditor/WordEditor.stories.tsx
new file mode 100644
index 000000000..04b5235d4
--- /dev/null
+++ b/src/content/components/WordEditor/WordEditor.stories.tsx
@@ -0,0 +1,78 @@
+import React, { useState } from 'react'
+import { storiesOf } from '@storybook/react'
+import { action } from '@storybook/addon-actions'
+import { jsxDecorator } from 'storybook-addon-jsx'
+import { withPropsTable } from 'storybook-addon-react-docgen'
+import { withKnobs, boolean, number } from '@storybook/addon-knobs'
+import { WordEditor } from './WordEditor'
+import {
+ withLocalStyle,
+ withSideEffect,
+ mockRuntimeMessage
+} from '@/_helpers/storybook'
+import faker from 'faker'
+import { newWord } from '@/_helpers/record-manager'
+import getDefaultConfig from '@/app-config'
+import WordEditorPortal from './WordEditor.portal'
+
+storiesOf('Content Scripts|WordEditor', module)
+ .addDecorator(withPropsTable)
+ .addDecorator(jsxDecorator)
+ .addDecorator(withKnobs)
+ .addDecorator(
+ withSideEffect(
+ mockRuntimeMessage(async message => {
+ action(message.type)(message['payload'])
+ })
+ )
+ )
+ .add(
+ 'WordEditor',
+ () => {
+ const config = getDefaultConfig()
+ return (
+ <WordEditor
+ dictPanelWidth={number('Dict Panel Width', 450)}
+ word={newWord({
+ date: faker.date.past().valueOf(),
+ text: faker.random.word(),
+ context: faker.lorem.sentence(),
+ title: faker.random.word(),
+ url: faker.internet.url(),
+ favicon: faker.image.imageUrl(),
+ trans: faker.lorem.sentence(),
+ note: faker.lorem.sentences()
+ })}
+ ctxTrans={config.ctxTrans}
+ onWordChanged={action('Word Changed')}
+ onClose={action('Close')}
+ />
+ )
+ },
+ {
+ decorators: [withLocalStyle(require('./WordEditor.scss'))]
+ }
+ )
+ .add('WordEditorPortal', () => {
+ const config = getDefaultConfig()
+ return (
+ <WordEditorPortal
+ show={boolean('Show', true)}
+ withAnimation={boolean('With Animation', true)}
+ dictPanelWidth={number('Dict Panel Width', 450)}
+ word={newWord({
+ date: faker.date.past().valueOf(),
+ text: faker.random.word(),
+ context: faker.lorem.sentence(),
+ title: faker.random.word(),
+ url: faker.internet.url(),
+ favicon: faker.image.imageUrl(),
+ trans: faker.lorem.sentence(),
+ note: faker.lorem.sentences()
+ })}
+ ctxTrans={config.ctxTrans}
+ onWordChanged={action('Word Changed')}
+ onClose={action('Close')}
+ />
+ )
+ })
diff --git a/src/content/components/WordEditor/WordEditor.tsx b/src/content/components/WordEditor/WordEditor.tsx
new file mode 100644
index 000000000..7961a4da8
--- /dev/null
+++ b/src/content/components/WordEditor/WordEditor.tsx
@@ -0,0 +1,22 @@
+import React, { FC } from 'react'
+import { WordEditorPanel, WordEditorPanelProps } from './WordEditorPanel'
+
+export interface WordEditorProps extends WordEditorPanelProps {
+ dictPanelWidth: number
+}
+
+export const WordEditor: FC<WordEditorProps> = props => {
+ const { dictPanelWidth, ...restProps } = props
+ return (
+ <div className="wordEditor-Container">
+ <div
+ className="wordEditor-PanelContainer"
+ style={{ width: window.innerWidth - dictPanelWidth - 40 }}
+ >
+ <WordEditorPanel {...restProps} />
+ </div>
+ </div>
+ )
+}
+
+export default WordEditor
diff --git a/src/content/components/WordEditor/_style.scss b/src/content/components/WordEditor/WordEditorPanel.scss
similarity index 83%
rename from src/content/components/WordEditor/_style.scss
rename to src/content/components/WordEditor/WordEditorPanel.scss
index 6de405ae4..6529fa352 100644
--- a/src/content/components/WordEditor/_style.scss
+++ b/src/content/components/WordEditor/WordEditorPanel.scss
@@ -13,30 +13,6 @@
/*-----------------------------------------------*\
Base
\*-----------------------------------------------*/
-html {
- height: 100%;
- box-sizing: border-box;
- background: transparent;
-}
-
-*, *:before, *:after {
- box-sizing: inherit;
-}
-
-body {
- display: flex;
- justify-content: center;
- align-items: center;
- overflow: hidden;
- height: 100%;
- margin: 0;
- padding: 0;
- color: #333;
- background-color: rgba(0, 0, 0, 0.4);
- font-size: 14px;
- font-family: "Helvetica Neue", Helvetica, Arial, "Hiragino Sans GB", "Hiragino Sans GB W3", "Microsoft YaHei UI", "Microsoft YaHei", sans-serif;
-}
-
label {
display: block;
margin-bottom: 5px;
@@ -45,6 +21,7 @@ label {
input,
textarea {
+ box-sizing: border-box;
display: block;
resize: vertical;
width: 100%;
@@ -63,18 +40,26 @@ textarea {
&:focus {
border-color: #66afe9;
outline: 0;
- box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 8px rgba(102, 175, 233, 0.6);
+ box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075),
+ 0 0 8px rgba(102, 175, 233, 0.6);
}
}
/*-----------------------------------------------*\
Components
\*-----------------------------------------------*/
-.wordEditor-Container {
- width: 800px;
+.wordEditor-Panel {
+ display: flex;
+ flex-direction: column;
+ max-width: 800px;
+ min-width: 400px;
+ max-height: 90vh;
border-radius: 6px;
background: #fff;
box-shadow: 0 5px 15px rgba(0, 0, 0, 0.5);
+ font-size: 13px;
+ font-family: 'Helvetica Neue', Helvetica, Arial, 'Hiragino Sans GB',
+ 'Hiragino Sans GB W3', 'Microsoft YaHei UI', 'Microsoft YaHei', sans-serif;
}
.wordEditor-Header {
@@ -108,16 +93,13 @@ textarea {
}
.wordEditor-Main {
- display: flex;
- height: 70vh;
- max-height: 1000px;
+ flex: 1;
+ overflow-x: hidden;
+ overflow-y: scroll;
}
.wordEditor-Note {
- flex: 1.2;
padding: 15px;
- overflow-x: hidden;
- overflow-y: scroll;
a {
text-decoration: none;
@@ -206,4 +188,4 @@ textarea {
}
}
-@import '../WordCards/style'
+@import './WordCards.scss';
diff --git a/src/content/components/WordEditor/WordEditorPanel.tsx b/src/content/components/WordEditor/WordEditorPanel.tsx
new file mode 100644
index 000000000..ce9671a4c
--- /dev/null
+++ b/src/content/components/WordEditor/WordEditorPanel.tsx
@@ -0,0 +1,218 @@
+import React, { FC, useState, useEffect } from 'react'
+import {
+ Word,
+ getWordsByText,
+ deleteWords,
+ saveWord
+} from '@/_helpers/record-manager'
+import { AppConfig } from '@/app-config'
+import { translateCtx } from '@/_helpers/translateCtx'
+import { useTranslate } from '@/_helpers/i18n'
+import WordCards from './WordCards'
+import { message } from '@/_helpers/browser-api'
+
+export interface WordEditorPanelProps {
+ word: Word
+ /** dicts to translate context */
+ ctxTrans: AppConfig['ctxTrans']
+
+ onWordChanged: (newWord: Word) => void
+ onClose: () => void
+}
+
+export const WordEditorPanel: FC<WordEditorPanelProps> = props => {
+ const { t } = useTranslate(['common', 'content'])
+ const [isDirty, setDirty] = useState(false)
+ const [relatedWords, setRelatedWords] = useState<Word[]>([])
+
+ useEffect(getRelatedWords, [props.word.text])
+
+ return (
+ <div className="wordEditor-Panel">
+ <header className="wordEditor-Header">
+ <h1 className="wordEditor-Title">{t('content:wordEditor.title')}</h1>
+ <button
+ type="button"
+ className="wordEditor-Note_BtnClose"
+ onClick={closeEditor}
+ >
+ ×
+ </button>
+ </header>
+ <div className="wordEditor-Main">
+ <form className="wordEditor-Note">
+ <label htmlFor="wordEditor-Note_Word">{t('note.word')}</label>
+ <input
+ type="text"
+ name="text"
+ id="wordEditor-Note_Word"
+ value={props.word.text}
+ onChange={formChanged}
+ />
+ <label htmlFor="wordEditor-Note_Trans">
+ {t('note.trans')}
+ <a
+ href="https://github.com/crimx/ext-saladict/wiki/Q&A#%E9%97%AE%E6%B7%BB%E5%8A%A0%E7%94%9F%E8%AF%8D%E5%8F%AF%E4%B8%8D%E5%8F%AF%E4%BB%A5%E5%8A%A0%E5%85%A5%E5%8D%95%E8%AF%8D%E7%BF%BB%E8%AF%91%E8%80%8C%E4%B8%8D%E6%98%AF%E7%BF%BB%E8%AF%91%E6%95%B4%E5%8F%A5%E4%B8%8A%E4%B8%8B%E6%96%87"
+ target="_blank"
+ rel="nofollow noopener noreferrer"
+ >
+ {' '}
+ Why?
+ </a>
+ </label>
+ <textarea
+ rows={5}
+ name="trans"
+ id="wordEditor-Note_Trans"
+ value={props.word.trans}
+ onChange={formChanged}
+ />
+ <label htmlFor="wordEditor-Note_Note">{t('note.note')}</label>
+ <textarea
+ rows={5}
+ name="note"
+ id="wordEditor-Note_Note"
+ value={props.word.note}
+ onChange={formChanged}
+ />
+ <label htmlFor="wordEditor-Note_Context">{t('note.context')}</label>
+ <textarea
+ rows={5}
+ name="context"
+ id="wordEditor-Note_Context"
+ value={props.word.context}
+ onChange={formChanged}
+ />
+ <label htmlFor="wordEditor-Note_SrcTitle">{t('note.srcTitle')}</label>
+ <input
+ type="text"
+ name="title"
+ id="wordEditor-Note_SrcTitle"
+ value={props.word.title}
+ onChange={formChanged}
+ />
+ <label htmlFor="wordEditor-Note_SrcLink">{t('note.srcLink')}</label>
+ <input
+ type="text"
+ name="url"
+ id="wordEditor-Note_SrcLink"
+ value={props.word.url}
+ onChange={formChanged}
+ />
+ <label htmlFor="wordEditor-Note_SrcFavicon">
+ {t('note.srcFavicon')}
+ {props.word.favicon ? (
+ <img
+ className="wordEditor-Note_SrcFavicon"
+ src={props.word.favicon}
+ alt={t('note.srcTitle')}
+ />
+ ) : null}
+ </label>
+ <input
+ type="text"
+ name="favicon"
+ id="wordEditor-Note_SrcFavicon"
+ value={props.word.favicon}
+ onChange={formChanged}
+ />
+ </form>
+ {relatedWords.length > 0 && (
+ <WordCards
+ words={relatedWords}
+ onCardDelete={word => {
+ if (window.confirm(t('content:wordEditor.deleteConfirm'))) {
+ deleteWords('notebook', [word.date]).then(getRelatedWords)
+ }
+ }}
+ />
+ )}
+ </div>
+ <footer className="wordEditor-Footer">
+ <button
+ type="button"
+ className="wordEditor-Note_Btn"
+ onClick={() => {
+ translateCtx(props.word.context || props.word.text, props.ctxTrans)
+ .then(trans => {
+ props.onWordChanged({
+ ...props.word,
+ trans: props.word.trans
+ ? props.word.trans + '\n\n' + trans
+ : trans
+ })
+ })
+ .catch(console.error)
+ }}
+ >
+ {t('content:transContext')}
+ </button>
+ {!window.__SALADICT_INTERNAL_PAGE__ && (
+ <button
+ type="button"
+ className="wordEditor-Note_Btn"
+ onClick={() => {
+ message.send({
+ type: 'OPEN_URL',
+ payload: {
+ url: 'options.html?menuselected=Notebook',
+ self: true
+ }
+ })
+ }}
+ >
+ {t('content:neverShow')}
+ </button>
+ )}
+ <button
+ type="button"
+ className="wordEditor-Note_Btn"
+ onClick={closeEditor}
+ >
+ {t('cancel')}
+ </button>
+ <button
+ type="button"
+ className="wordEditor-Note_BtnSave"
+ onClick={() =>
+ saveWord('notebook', props.word)
+ .then(closeEditor)
+ .catch(console.error)
+ }
+ >
+ {t('save')}
+ </button>
+ </footer>
+ </div>
+ )
+
+ function closeEditor() {
+ if (!isDirty || confirm(t('content:wordEditor.closeConfirm'))) {
+ props.onClose()
+ }
+ }
+
+ function formChanged({
+ currentTarget
+ }: React.ChangeEvent<HTMLInputElement | HTMLTextAreaElement>) {
+ setDirty(true)
+
+ props.onWordChanged({
+ ...props.word,
+ [currentTarget.name]: currentTarget.value
+ })
+ }
+
+ function getRelatedWords() {
+ if (!props.word.text) {
+ setRelatedWords([])
+ }
+ getWordsByText('notebook', props.word.text)
+ .then(words => {
+ setRelatedWords(words.filter(({ date }) => date !== props.word.date))
+ })
+ .catch(() => {})
+ }
+}
+
+export default WordEditorPanel
diff --git a/src/content/components/WordEditor/index.tsx b/src/content/components/WordEditor/index.tsx
deleted file mode 100644
index ebabf3188..000000000
--- a/src/content/components/WordEditor/index.tsx
+++ /dev/null
@@ -1,248 +0,0 @@
-import React from 'react'
-import { translate } from 'react-i18next'
-import { TranslationFunction } from 'i18next'
-import { SelectionInfo, getDefaultSelectionInfo } from '@/_helpers/selection'
-import { Word, deleteWords } from '@/_helpers/record-manager'
-import WordCards from '../WordCards'
-import { message } from '@/_helpers/browser-api'
-import { MsgType, MsgOpenUrl } from '@/typings/message'
-import { translateCtx } from '@/_helpers/translateCtx'
-import { DictID } from '@/app-config'
-
-const isSaladictInternalPage = !!window.__SALADICT_INTERNAL_PAGE__
-
-export interface WordEditorDispatchers {
- saveToNotebook: (info: SelectionInfo) => any
- getWordsByText: (text: string) => Promise<Word[]>
- closeDictPanel: () => any
- closeModal: () => any
- updateEditorWord: (word: SelectionInfo | null) => any
-}
-
-export interface WordEditorProps extends WordEditorDispatchers {
- dictPanelWidth: number
- editorWord: SelectionInfo
- ctxTrans: { [index in DictID]: boolean }
-}
-
-interface WordEditorState {
- relatedWords: Word[]
- width: number
- leftOffset: number
- isChanged: boolean
-}
-
-export class WordEditor extends React.PureComponent<WordEditorProps & { t: TranslationFunction }, WordEditorState> {
- constructor (props: WordEditorProps & { t: TranslationFunction }) {
- super(props)
-
- const winWidth = window.innerWidth
- const width = Math.min(800, Math.max(400, winWidth - props.dictPanelWidth - 100))
-
- let leftOffset = 0
- const emptySpace = (winWidth - width) / 2
- if (emptySpace < props.dictPanelWidth + 40) {
- const shouldMove = props.dictPanelWidth + 40 - emptySpace
- if (emptySpace > shouldMove) {
- leftOffset = shouldMove
- } else {
- this.props.closeDictPanel()
- }
- }
-
- this.state = {
- relatedWords: [],
- width,
- leftOffset,
- isChanged: false,
- }
- }
-
- formChanged = ({ currentTarget }) => {
- this.props.updateEditorWord({ ...this.props.editorWord, [currentTarget.name]: currentTarget.value })
- if (!this.state.isChanged) {
- this.setState({ isChanged: true })
- }
- }
-
- saveToNotebook = () => {
- this.props.saveToNotebook(this.props.editorWord)
- .then(() => this.props.closeModal())
- }
-
- closeModal = () => {
- if (!this.state.isChanged || confirm(this.props.t('wordEditorCloseConfirm'))) {
- this.props.closeModal()
- }
- }
-
- openOptions = () => {
- message.send<MsgOpenUrl>({
- type: MsgType.OpenURL,
- url: 'options.html?menuselected=Notebook',
- self: true,
- })
- }
-
- getRelatedWords = () => {
- const word = this.props.editorWord
- if (!word.text) { return }
- this.props.getWordsByText(word.text)
- .then(words => {
- if (word['date']) {
- words = words.filter(({ date }) => date !== word['date'])
- }
- this.setState({ relatedWords: words })
- })
- }
-
- deleteCard = (word: Word) => {
- if (window.confirm(this.props.t('wordEditorDeleteConfirm'))) {
- deleteWords('notebook', [word.date])
- .then(this.getRelatedWords)
- }
- }
-
- translateCtx = () => {
- const word = this.props.editorWord
- translateCtx(word.context || word.text, this.props.ctxTrans)
- .then(trans => {
- if (trans) {
- // incase user has inputed other words
- const word = this.props.editorWord
- this.props.updateEditorWord({
- ...word,
- trans: word.trans
- ? word.trans + '\n\n' + trans
- : trans
- })
- }
- })
- .catch(() => {/* nothing */})
- }
-
- componentDidMount () {
- this.getRelatedWords()
- if (!this.props.editorWord.trans) {
- this.translateCtx()
- }
- }
-
- render () {
- const {
- t,
- } = this.props
-
- const editorWord = this.props.editorWord || getDefaultSelectionInfo()
-
- const {
- relatedWords,
- width,
- leftOffset,
- } = this.state
-
- return (
- <div className='wordEditor-Container' style={{ width, transform: `translateX(${leftOffset}px)` }}>
- <header className='wordEditor-Header'>
- <h1 className='wordEditor-Title'>{t('wordEditorTitle')}</h1>
- <button type='button'
- className='wordEditor-Note_BtnClose'
- onClick={this.closeModal}
- >×</button>
- </header>
- <div className='wordEditor-Main'>
- <form className='wordEditor-Note'>
- <label htmlFor='wordEditor-Note_Word'>{t('wordEditorNoteWord')}</label>
- <input type='text'
- name='text'
- id='wordEditor-Note_Word'
- value={editorWord.text}
- onChange={this.formChanged}
- />
- <label htmlFor='wordEditor-Note_Trans'>
- {t('wordEditorNoteTrans')}
- <a
- href='https://github.com/crimx/ext-saladict/wiki/Q&A#%E9%97%AE%E6%B7%BB%E5%8A%A0%E7%94%9F%E8%AF%8D%E5%8F%AF%E4%B8%8D%E5%8F%AF%E4%BB%A5%E5%8A%A0%E5%85%A5%E5%8D%95%E8%AF%8D%E7%BF%BB%E8%AF%91%E8%80%8C%E4%B8%8D%E6%98%AF%E7%BF%BB%E8%AF%91%E6%95%B4%E5%8F%A5%E4%B8%8A%E4%B8%8B%E6%96%87'
- target='_blank'
- rel='nofollow noopener noreferrer'
- > Why?</a>
- </label>
- <textarea rows={5}
- name='trans'
- id='wordEditor-Note_Trans'
- value={editorWord.trans}
- onChange={this.formChanged}
- />
- <label htmlFor='wordEditor-Note_Note'>{t('wordEditorNoteNote')}</label>
- <textarea rows={5}
- name='note'
- id='wordEditor-Note_Note'
- value={editorWord.note}
- onChange={this.formChanged}
- />
- <label htmlFor='wordEditor-Note_Context'>{t('wordEditorNoteContext')}</label>
- <textarea rows={5}
- name='context'
- id='wordEditor-Note_Context'
- value={editorWord.context}
- onChange={this.formChanged}
- />
- <label htmlFor='wordEditor-Note_SrcTitle'>{t('wordEditorNoteSrcTitle')}</label>
- <input type='text'
- name='title'
- id='wordEditor-Note_SrcTitle'
- value={editorWord.title}
- onChange={this.formChanged}
- />
- <label htmlFor='wordEditor-Note_SrcLink'>{t('wordEditorNoteSrcLink')}</label>
- <input type='text'
- name='url'
- id='wordEditor-Note_SrcLink'
- value={editorWord.url}
- onChange={this.formChanged}
- />
- <label htmlFor='wordEditor-Note_SrcFavicon'>
- {t('wordEditorNoteSrcFavicon')}
- {editorWord.favicon
- ? <img
- className='wordEditor-Note_SrcFavicon'
- src={editorWord.favicon}
- alt={t('wordEditorNoteSrcTitle')}
- />
- : null}
- </label>
- <input type='text'
- name='favicon'
- id='wordEditor-Note_SrcFavicon'
- value={editorWord.favicon}
- onChange={this.formChanged}
- />
- </form>
- {relatedWords.length > 0 && <WordCards words={relatedWords} deleteCard={this.deleteCard} /> }
- </div>
- <footer className='wordEditor-Footer'>
- <button type='button'
- className='wordEditor-Note_Btn'
- onClick={this.translateCtx}
- >{t('transContext')}</button>
- {!isSaladictInternalPage &&
- <button type='button'
- className='wordEditor-Note_Btn'
- onClick={this.openOptions}
- >{t('neverShow')}</button>
- }
- <button type='button'
- className='wordEditor-Note_Btn'
- onClick={this.closeModal}
- >{t('cancel')}</button>
- <button type='button'
- className='wordEditor-Note_BtnSave'
- onClick={this.saveToNotebook}
- >{t('save')}</button>
- </footer>
- </div>
- )
- }
-}
-
-export default translate()(WordEditor)
diff --git a/src/content/components/WordEditorPortal/_style.scss b/src/content/components/WordEditorPortal/_style.scss
deleted file mode 100644
index 3edb26771..000000000
--- a/src/content/components/WordEditorPortal/_style.scss
+++ /dev/null
@@ -1,40 +0,0 @@
-:root:root:root:root:root {
- .saladict-WordEditor {
- @extend %reset-important;
- position: fixed !important;
- z-index: $global-zindex-dicteditor !important;
- top: 0 !important;
- left: 0 !important;
- width: 100vw !important;
- height: 100vh !important;
- overflow: hidden !important;
- }
-
- .saladict-WordEditor-enter {
- will-change: opacity;
- opacity: 0 !important;
- }
-
- .saladict-WordEditor-enter-active {
- opacity: 1 !important;
- }
-
- .saladict-WordEditor-exit {
- will-change: opacity;
- opacity: 1 !important;
- }
-
- .saladict-WordEditor-exit-active {
- opacity: 0 !important;
- }
-
- /*-----------------------------------------------*\
- States
- \*-----------------------------------------------*/
-
- .isAnimate {
- &.saladict-WordEditor {
- transition: opacity 0.5s !important;
- }
- }
-}
diff --git a/src/content/components/WordEditorPortal/index.tsx b/src/content/components/WordEditorPortal/index.tsx
deleted file mode 100644
index 7e29b69bc..000000000
--- a/src/content/components/WordEditorPortal/index.tsx
+++ /dev/null
@@ -1,109 +0,0 @@
-import React from 'react'
-import ReactDOM from 'react-dom'
-import PortalFrame from '@/components/PortalFrame'
-import WordEditor, { WordEditorProps } from '../WordEditor'
-import { getWordsByText } from '@/_helpers/record-manager'
-import { Omit } from '@/typings/helpers'
-import CSSTransition from 'react-transition-group/CSSTransition'
-
-const getWordsByTextFromNotebook = (text: string) => getWordsByText('notebook', text)
-
-export interface WordEditorPortalProps extends Omit<
- WordEditorProps,
- 'getWordsByText'
-> {
- isAnimation: boolean
-}
-
-export default class WordEditorPortal extends React.Component<WordEditorPortalProps> {
- isMount = false
- el = document.createElement('div')
- frameHead = '<meta name="viewport" content="width=device-width, initial-scale=1">\n' + (
- process.env.NODE_ENV === 'production'
- ? `<link type="text/css" rel="stylesheet" href="${browser.runtime.getURL('wordeditor.css')}" />`
- : Array.from(document.querySelectorAll<HTMLLinkElement>('link[rel="stylesheet"]'))
- .map(link => link.outerHTML)
- .join('\n')
- + `
- <script>
- document.querySelectorAll('link')
- .forEach(link => {
- return fetch(link.href)
- .then(r => r.blob())
- .then(b => {
- var reader = new FileReader();
- reader.onload = function() {
- if (reader.result.indexOf('wordEditor') === -1) {
- link.remove()
- }
- }
- reader.readAsText(b)
- })
- })
- </script>
- `
- )
-
- constructor (props) {
- super(props)
- this.el.className = 'saladict-DIV'
- }
-
- mountEL = () => {
- document.body.appendChild(this.el)
- this.isMount = true
- }
-
- unmountEL = () => {
- document.body.removeChild(this.el)
- this.isMount = false
- }
-
- renderEditor = () => {
- const {
- isAnimation,
- ...restProps
- } = this.props
-
- return (
- <PortalFrame
- className={'saladict-WordEditor' + (isAnimation ? ' isAnimate' : '')}
- name='saladict-wordeditor'
- frameBorder='0'
- head={this.frameHead}
- >
- <WordEditor
- {...restProps}
- getWordsByText={getWordsByTextFromNotebook}
- />
- </PortalFrame>
- )
- }
-
- render () {
- const {
- editorWord,
- isAnimation,
- } = this.props
-
- if (editorWord && !this.isMount) {
- this.mountEL()
- }
-
- return ReactDOM.createPortal(
- <CSSTransition
- classNames='saladict-WordEditor'
- in={!!editorWord}
- timeout={500}
- mountOnEnter={true}
- unmountOnExit={true}
- enter={isAnimation}
- exit={isAnimation}
- onExited={this.unmountEL}
- >
- {this.renderEditor}
- </CSSTransition>,
- this.el,
- )
- }
-}
diff --git a/yarn.lock b/yarn.lock
index d4379e80a..1ffc3a89f 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2094,6 +2094,11 @@
resolved "https://registry.yarnpkg.com/@types/events/-/events-3.0.0.tgz#2862f3f58a9a7f7c3e78d79f130dd4d71c25c2a7"
integrity sha512-EaObqwIvayI5a8dCzhFrjKzVwKLxjoG9T6Ppd5CEo07LRKfQ8Yokw54r5+Wq7FaBQ+yXRvQAYPrHwya1/UFt9g==
+"@types/faker@^4.1.5":
+ version "4.1.5"
+ resolved "https://registry.yarnpkg.com/@types/faker/-/faker-4.1.5.tgz#8f620f9c9a67150aa0a32b4e8a407da43fca61d4"
+ integrity sha512-YSDqoBEWYGdNk53xSkkb6REaUaVSlIjxIAGjj/nbLzlZOit7kUU+nA2zC2qQkIVO4MQ+3zl4Sz7aw+kbpHHHUQ==
+
"@types/filesystem@*":
version "0.0.29"
resolved "https://registry.yarnpkg.com/@types/filesystem/-/filesystem-0.0.29.tgz#ee3748eb5be140dcf980c3bd35f11aec5f7a3748"
@@ -5863,6 +5868,11 @@ extsprintf@^1.2.0:
resolved "https://registry.yarnpkg.com/extsprintf/-/extsprintf-1.4.0.tgz#e2689f8f356fad62cca65a3a91c5df5f9551692f"
integrity sha1-4mifjzVvrWLMplo6kcXfX5VRaS8=
+faker@^4.1.0:
+ version "4.1.0"
+ resolved "https://registry.yarnpkg.com/faker/-/faker-4.1.0.tgz#1e45bbbecc6774b3c195fad2835109c6d748cc3f"
+ integrity sha1-HkW7vsxndLPBlfrSg1EJxtdIzD8=
+
fast-deep-equal@^2.0.1:
version "2.0.1"
resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-2.0.1.tgz#7b05218ddf9667bf7f370bf7fdb2cb15fdd0aa49"
|
refactor
|
word editor
|
75d93d9d722f55955e27c6f1e240492dfab33f70
|
2019-03-02 19:45:42
|
CRIMX
|
fix: type error
| false
|
diff --git a/src/components/dictionaries/helpers.ts b/src/components/dictionaries/helpers.ts
index 9f8c2b740..70fb67b85 100644
--- a/src/components/dictionaries/helpers.ts
+++ b/src/components/dictionaries/helpers.ts
@@ -34,7 +34,7 @@ export const enum SearchErrorType {
NetWorkError,
}
-export function handleNoResult<T> (): Promise<T> {
+export function handleNoResult<T = any> (): Promise<T> {
return Promise.reject(SearchErrorType.NoResult)
}
diff --git a/src/components/dictionaries/naver/View.tsx b/src/components/dictionaries/naver/View.tsx
index 36ddb8dff..6514e3c35 100644
--- a/src/components/dictionaries/naver/View.tsx
+++ b/src/components/dictionaries/naver/View.tsx
@@ -9,14 +9,13 @@ export default class DictNaver extends React.PureComponent<ViewPorps<NaverResult
]
render () {
- const { t, searchText } = this.props
const { lang, entry } = this.props.result
return (
<>
<select
style={{ width: '100%' }}
- onChange={e => searchText({
+ onChange={e => this.props.searchText({
id: 'naver',
payload: { lang: e.target.value },
})}
diff --git a/src/components/dictionaries/naver/engine.ts b/src/components/dictionaries/naver/engine.ts
index c001fb49f..12dcf0ac9 100644
--- a/src/components/dictionaries/naver/engine.ts
+++ b/src/components/dictionaries/naver/engine.ts
@@ -2,7 +2,6 @@ import { fetchDirtyDOM } from '@/_helpers/fetch-dom'
import {
handleNoResult,
handleNetWorkError,
- getText,
getInnerHTMLBuilder,
SearchFunction,
GetSrcPageFunction,
|
fix
|
type error
|
2ac99c0a66a1adc18ee4ef660608f814823dd198
|
2020-03-20 19:19:52
|
crimx
|
ci: lint source on ci
| false
|
diff --git a/.travis.yml b/.travis.yml
index d56185eef..96510cbbe 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -2,5 +2,6 @@ language: node_js
node_js:
- 'stable'
script:
+ - yarn lint
- yarn build
- yarn test
|
ci
|
lint source on ci
|
3b2ce9c7a6ec3b409b776e4001d471573066a8cb
|
2019-03-02 19:59:20
|
CRIMX
|
chore(release): 6.25.0
| false
|
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 394dabea1..ad3c0520d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,33 @@
All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
+<a name="6.25.0"></a>
+# [6.25.0](https://github.com/crimx/ext-saladict/compare/v6.24.4...v6.25.0) (2019-03-02)
+
+
+### Bug Fixes
+
+* type error ([75d93d9](https://github.com/crimx/ext-saladict/commit/75d93d9))
+* **dicts:** update hjdict korean page ([66c7341](https://github.com/crimx/ext-saladict/commit/66c7341))
+* **options:** popup options ([5701525](https://github.com/crimx/ext-saladict/commit/5701525))
+* **options:** styling ([dca805f](https://github.com/crimx/ext-saladict/commit/dca805f))
+* **options:** wording ([087102a](https://github.com/crimx/ext-saladict/commit/087102a))
+* **panel:** prevent drag event losing ([05dbaec](https://github.com/crimx/ext-saladict/commit/05dbaec))
+* better korean rendering ([e13b51e](https://github.com/crimx/ext-saladict/commit/e13b51e))
+
+
+### Features
+
+* **dicts:** add dict naver ([cef45b4](https://github.com/crimx/ext-saladict/commit/cef45b4))
+
+
+### Performance Improvements
+
+* **panel:** faster style loading ([e2757af](https://github.com/crimx/ext-saladict/commit/e2757af))
+* **panel:** remove extra update for auto-pasting ([2f7182b](https://github.com/crimx/ext-saladict/commit/2f7182b))
+
+
+
<a name="6.24.4"></a>
## [6.24.4](https://github.com/crimx/ext-saladict/compare/v6.24.3...v6.24.4) (2019-02-17)
diff --git a/package.json b/package.json
index b18ac77be..6848584d4 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
{
"name": "saladict",
- "version": "6.24.4",
+ "version": "6.25.0",
"description": "Chrome extension and Firefox WebExtension, inline translator powered by mutiple online dictionaries",
"private": true,
"scripts": {
|
chore
|
6.25.0
|
7f4f89e4c5eda681d60c82a8beb68086528d4eb2
|
2018-01-15 01:43:35
|
greenkeeper[bot]
|
docs(readme): add Greenkeeper badge
| false
|
diff --git a/README.md b/README.md
index 2fee9a9ed..ed628c397 100644
--- a/README.md
+++ b/README.md
@@ -1,5 +1,7 @@
# Saladict 沙拉查词 5
+[](https://greenkeeper.io/)
+
Chrome extension, feature-rich inline translator powered with mutiple online dictionaries.
[【中文】](https://www.crimx.com/crx-saladict/)Chrome 浏览器插件，网页划词翻译。
|
docs
|
add Greenkeeper badge
|
992b505a601fb96b522f52c823a2a92845a05c50
|
2018-12-04 12:56:58
|
CRIMX
|
refactor(dicts): update static speaker styles
| false
|
diff --git a/src/components/dictionaries/googledict/_style.scss b/src/components/dictionaries/googledict/_style.scss
index e371febdb..47dbc53e5 100644
--- a/src/components/dictionaries/googledict/_style.scss
+++ b/src/components/dictionaries/googledict/_style.scss
@@ -948,7 +948,7 @@
margin-bottom: 5px;
}
- .ellip {
+ .ellip, .D8IBCf {
display: none !important;
}
}
diff --git a/src/components/dictionaries/googledict/engine.ts b/src/components/dictionaries/googledict/engine.ts
index 10ff31eb5..9a58612de 100644
--- a/src/components/dictionaries/googledict/engine.ts
+++ b/src/components/dictionaries/googledict/engine.ts
@@ -21,7 +21,7 @@ export interface GoogleDictResult {
type GoogleDictSearchResult = DictSearchResult<GoogleDictResult>
-const getInnerHTML = getInnerHTMLBuilder('https://www.google.com/')
+const getInnerHTML = getInnerHTMLBuilder('https://www.google.com/', {})
export const search: SearchFunction<GoogleDictSearchResult> = (
text, config, payload
diff --git a/src/components/dictionaries/longman/_style.scss b/src/components/dictionaries/longman/_style.scss
index 5ce5ac23e..fc5fca2ba 100644
--- a/src/components/dictionaries/longman/_style.scss
+++ b/src/components/dictionaries/longman/_style.scss
@@ -1,7 +1,7 @@
.dictLongman-Speaker {
// cover the original bulet point
position: absolute;
- top: 0.2em;
+ top: 0;
left: 0.6em;
background: white;
diff --git a/src/components/dictionaries/longman/engine.ts b/src/components/dictionaries/longman/engine.ts
index b33a330ac..e0fe2eca3 100644
--- a/src/components/dictionaries/longman/engine.ts
+++ b/src/components/dictionaries/longman/engine.ts
@@ -106,14 +106,7 @@ function handleDOMLex (
const mp3 = $speaker.dataset.srcMp3
if (mp3) {
$speaker.outerHTML =
- `<button data-src-mp3="${mp3}" title="${$speaker.title}" class="dictLongman-Speaker">
- <svg width="1.2em" height="1.2em" viewBox="0 0 58 58" xmlns="http://www.w3.org/2000/svg">
- <path d="M14.35 20.237H5.77c-1.2 0-2.17.97-2.17 2.17v13.188c0 1.196.97 2.168 2.17 2.168h8.58c.387 0 .766.103 1.1.3l13.748 12.8c1.445.85 3.268-.192 3.268-1.87V9.006c0-1.677-1.823-2.72-3.268-1.87l-13.747 12.8c-.334.196-.713.3-1.1.3z"/>
- <path d="M36.772 39.98c-.31 0-.62-.118-.856-.355-.476-.475-.476-1.243 0-1.716 5.212-5.216 5.212-13.702 0-18.916-.476-.473-.476-1.24 0-1.716.473-.474 1.24-.474 1.715 0 6.162 6.16 6.162 16.185 0 22.347-.234.237-.546.356-.858.356z"/>
- <path d="M41.07 44.886c-.312 0-.62-.118-.86-.356-.473-.475-.473-1.24 0-1.715 7.573-7.57 7.573-19.89 0-27.462-.473-.474-.473-1.24 0-1.716.478-.473 1.243-.473 1.717 0 8.517 8.52 8.517 22.377 0 30.893-.238.238-.547.356-.857.356z"/>
- <path d="M44.632 50.903c-.312 0-.622-.118-.858-.356-.475-.474-.475-1.24 0-1.716 5.287-5.283 8.198-12.307 8.198-19.77 0-7.466-2.91-14.49-8.198-19.775-.475-.474-.475-1.24 0-1.715.475-.474 1.24-.474 1.717 0 5.745 5.744 8.91 13.375 8.91 21.49 0 8.112-3.165 15.744-8.91 21.487-.237.238-.547.356-.858.356z"/>
- </svg>
- </button>`
+ `<button data-src-mp3="${mp3}" title="${$speaker.title}" class="dictLongman-Speaker">🔊</button>`
}
}
)
|
refactor
|
update static speaker styles
|
8fd70e6b4a437746b841597c46dc5f772d21cab5
|
2019-12-28 20:52:28
|
crimx
|
refactor(content): fix word editor message api
| false
|
diff --git a/src/components/WordPage/App.tsx b/src/components/WordPage/App.tsx
index 21abf73a8..32fb7833a 100644
--- a/src/components/WordPage/App.tsx
+++ b/src/components/WordPage/App.tsx
@@ -316,7 +316,10 @@ export class WordPageMain extends React.Component<
try {
const word = JSON.parse(decodeURIComponent(infoText)) as Word
setTimeout(() => {
- message.self.send({ type: 'UPDATE_WORD_EDITOR_WORD', payload: word })
+ message.self.send({
+ type: 'UPDATE_WORD_EDITOR_WORD',
+ payload: { word, translateCtx: true }
+ })
}, 1000)
} catch (err) {
console.warn(err)
@@ -352,7 +355,7 @@ export class WordPageMain extends React.Component<
setTimeout(() => {
message.self.send({
type: 'UPDATE_WORD_EDITOR_WORD',
- payload: word
+ payload: { word }
})
}, 500)
}}
diff --git a/src/content/components/WordEditor/Notes.tsx b/src/content/components/WordEditor/Notes.tsx
index 3dc4f6357..09755ac06 100644
--- a/src/content/components/WordEditor/Notes.tsx
+++ b/src/content/components/WordEditor/Notes.tsx
@@ -284,7 +284,7 @@ export const Notes: FC<NotesProps> = props => {
>
{() => (
<WordEditorPanel
- containerWidth={props.containerWidth}
+ containerWidth={props.containerWidth - 100}
colors={props.colors}
title={t('content:wordEditor.chooseCtxTitle')}
onClose={() => setShowCtxTransList(false)}
diff --git a/src/content/redux/modules/init.ts b/src/content/redux/modules/init.ts
index 604c5b6c0..a8fa11c92 100644
--- a/src/content/redux/modules/init.ts
+++ b/src/content/redux/modules/init.ts
@@ -167,7 +167,10 @@ export const init: Init<StoreActionCatalog, StoreState> = (
dispatch({ type: 'WORD_EDITOR_STATUS', payload: msg.payload })
return timer(100).then(() => {
// wait till snapshot is taken
- dispatch({ type: 'SEARCH_START', payload: { word: msg.payload } })
+ dispatch({
+ type: 'SEARCH_START',
+ payload: { word: msg.payload.word }
+ })
})
case 'LAST_PLAY_AUDIO':
diff --git a/src/typings/message.ts b/src/typings/message.ts
index c90ef72dd..7cabf934a 100644
--- a/src/typings/message.ts
+++ b/src/typings/message.ts
@@ -274,7 +274,10 @@ export type MessageConfig = MessageConfigType<{
\* ------------------------------------------------ */
UPDATE_WORD_EDITOR_WORD: {
- payload: Word
+ payload: {
+ word: Word
+ translateCtx?: boolean
+ }
}
/* ------------------------------------------------ *\
|
refactor
|
fix word editor message api
|
a8e194f20869afaf47569c7e1fe31b910aa99299
|
2018-05-06 16:50:39
|
CRIMX
|
fix(config): more test friendly
| false
|
diff --git a/src/app-config.ts b/src/app-config.ts
index 0f2287a3e..1bfd42735 100644
--- a/src/app-config.ts
+++ b/src/app-config.ts
@@ -1,7 +1,7 @@
import cloneDeep from 'lodash/cloneDeep'
import { DeepReadonly } from './typings/helpers'
-const langUI = browser.i18n.getUILanguage().replace('-', '_')
+const langUI = (browser.i18n.getUILanguage() || 'en').replace('-', '_')
const langCode = /^zh_CN|zh_TW|en$/.test(langUI)
? langUI === 'zh_HK'
? 'zh_TW'
|
fix
|
more test friendly
|
40abbbc884f6ac3fba44e9423e9d4887048e91e0
|
2020-07-14 11:07:36
|
crimx
|
fix(panel): reset opacity on root container
| false
|
diff --git a/src/content/_style.scss b/src/content/_style.scss
new file mode 100644
index 000000000..3dfb31f47
--- /dev/null
+++ b/src/content/_style.scss
@@ -0,0 +1,3 @@
+.saladict-div {
+ @extend %reset-important;
+}
diff --git a/src/content/index.tsx b/src/content/index.tsx
index e1feb87ab..60c66f18d 100644
--- a/src/content/index.tsx
+++ b/src/content/index.tsx
@@ -8,6 +8,8 @@ import { createStore } from './redux'
import { I18nContextProvider } from '@/_helpers/i18n'
+import './_style.scss'
+
// Only load on top frame
if (window.parent === window && !window.__SALADICT_PANEL_LOADED__) {
window.__SALADICT_PANEL_LOADED__ = true
|
fix
|
reset opacity on root container
|
ed42ccb8e562ec059511b364b33e166b215d64ed
|
2019-01-17 16:53:24
|
CRIMX
|
fix(options): replace p elements with lis
| false
|
diff --git a/src/options/components/HeadInfo/_style.scss b/src/options/components/HeadInfo/_style.scss
index d3561afa0..c431ecc61 100644
--- a/src/options/components/HeadInfo/_style.scss
+++ b/src/options/components/HeadInfo/_style.scss
@@ -1,20 +1,23 @@
.head-info {
display: flex;
align-items: flex-end;
+ margin: 0;
+ padding: 0;
- & > * {
+ & > li {
margin: 0 0 0 8px;
- }
+ list-style-type: none;
- & > * > a {
- color: #fff;
- opacity: 0.65;
- transition: opacity 0.4s;
+ & > a {
+ color: #fff;
+ opacity: 0.65;
+ transition: opacity 0.4s;
- &:hover,
- &:active,
- &:focus, {
- opacity: 1;
+ &:hover,
+ &:active,
+ &:focus, {
+ opacity: 1;
+ }
}
}
}
diff --git a/src/options/components/HeadInfo/index.tsx b/src/options/components/HeadInfo/index.tsx
index f3b9fcc57..e540b7805 100644
--- a/src/options/components/HeadInfo/index.tsx
+++ b/src/options/components/HeadInfo/index.tsx
@@ -39,8 +39,8 @@ export class OptMenu extends React.PureComponent<{ t: TranslationFunction }> {
const { t } = this.props
return (
- <div className='head-info'>
- <p className='head-info-acknowledgement-wrap'>
+ <ul className='head-info'>
+ <li className='head-info-acknowledgement-wrap'>
<a
href='https://github.com/crimx/crx-saladict/wiki#acknowledgement'
onMouseEnter={this.showAcknowledgement}
@@ -76,14 +76,14 @@ export class OptMenu extends React.PureComponent<{ t: TranslationFunction }> {
</ol>
</div>
)}</CSSTransition>
- </p>
- <p>
+ </li>
+ <li>
<a
href='https://github.com/crimx/crx-saladict/wiki#wiki-content'
target='_blank'
rel='noopener'>{t('opt:head_info_instructions')}</a>
- </p>
- <p className='head-info-social-media-wrap'>
+ </li>
+ <li className='head-info-social-media-wrap'>
<a
href='mailto:straybugsgmail.com'
onMouseEnter={this.showSocialMedia}
@@ -104,15 +104,15 @@ export class OptMenu extends React.PureComponent<{ t: TranslationFunction }> {
<SocialMedia />
</div>
)}</CSSTransition >
- </p>
- <p>
+ </li>
+ <li>
<a
href='https://github.com/crimx/crx-saladict/issues'
target='_blank'
rel='noopener'
>{t('opt:head_info_report_issue')}</a>
- </p>
- </div>
+ </li>
+ </ul>
)
}
}
|
fix
|
replace p elements with lis
|
e892c253e819311952c157b606beb59ad784a9ea
|
2018-01-21 14:02:30
|
CRIMX
|
refactor(background): refector audio manager
| false
|
diff --git a/src/background/audio-manager.ts b/src/background/audio-manager.ts
index 758462be5..0b2f93026 100644
--- a/src/background/audio-manager.ts
+++ b/src/background/audio-manager.ts
@@ -1,25 +1,50 @@
/**
* To make sure only one audio plays at a time
*/
-export default class AudioManager {
- constructor () {
- this.audio = new Audio()
- }
- load (src) {
- this.audio.pause()
- this.audio.currentTime = 0
- this.audio.src = ''
- this.audio = new Audio(src)
+declare global {
+ interface Window {
+ __audio_manager__?: HTMLAudioElement
}
+}
- play (src) {
- if (src) { this.load(src) }
- // ignore interruption error
- this.audio.play().catch(() => {})
+export function load (src: string): HTMLAudioElement {
+ if (window.__audio_manager__) {
+ window.__audio_manager__.pause()
+ window.__audio_manager__.currentTime = 0
+ window.__audio_manager__.src = ''
}
+ window.__audio_manager__ = new Audio(src)
+ return window.__audio_manager__
+}
- listen (...args) {
- return this.audio.addEventListener(...args)
+export function play (src: string): Promise<void> {
+ // ignore interruption error
+ return load(src).play().catch(() => {})
+}
+
+export function addListener<K extends keyof HTMLMediaElementEventMap> (
+ type: K,
+ listener: (this: HTMLAudioElement, ev: HTMLMediaElementEventMap[K]) => any,
+ options?: boolean | AddEventListenerOptions
+): void
+export function addListener (
+ type: string,
+ listener: EventListenerOrEventListenerObject,
+ options?: boolean | AddEventListenerOptions
+): void
+export function addListener (type, listener, options): void {
+ if (window.__audio_manager__) {
+ if (options) {
+ window.__audio_manager__.addEventListener(type, listener, options)
+ } else {
+ window.__audio_manager__.addEventListener(type, listener)
+ }
}
}
+
+export default {
+ load,
+ play,
+ addListener,
+}
diff --git a/test/unit/background/audio-manager.spec.ts b/test/unit/background/audio-manager.spec.ts
new file mode 100644
index 000000000..b0096a6b2
--- /dev/null
+++ b/test/unit/background/audio-manager.spec.ts
@@ -0,0 +1,63 @@
+import audio from '../../../src/background/audio-manager'
+
+describe('Audio Manager', () => {
+ const bakAudio = (window as any).Audio
+ const mockAudioInstances: any[] = []
+ const mockAudio = jest.fn(() => {
+ const instance = {
+ play: jest.fn(() => Promise.resolve()),
+ pause: jest.fn(),
+ addEventListener: jest.fn(),
+ }
+ mockAudioInstances.push(instance)
+ return instance
+ })
+ beforeAll(() => {
+ (window as any).Audio = mockAudio
+ })
+ afterAll(() => {
+ (window as any).Audio = bakAudio
+ })
+ beforeEach(() => {
+ delete window.__audio_manager__
+ mockAudio.mockClear()
+ mockAudioInstances.length = 0
+ })
+
+ it('load', () => {
+ const url = 'https://e.a/load.mp3'
+ expect(audio.load(url)).toBe(mockAudioInstances[0])
+ expect(mockAudio).toBeCalledWith(url)
+ })
+
+ it('play', () => {
+ const url = 'https://e.b/play.mp3'
+ expect(audio.play(url)).toBeInstanceOf(Promise)
+ expect(mockAudio).toBeCalledWith(url)
+ expect(mockAudioInstances.length).toBe(1)
+ expect(mockAudioInstances[0].play).toHaveBeenCalledTimes(1)
+ })
+
+ it('play x 2 interrupted', () => {
+ const url1 = 'https://e.b/play1.mp3'
+ const url2 = 'https://e.b/play2.mp3'
+ expect(audio.load(url1)).toBe(mockAudioInstances[0])
+ expect(mockAudio).toBeCalledWith(url1)
+ expect(audio.play(url2)).toBeInstanceOf(Promise)
+ expect(mockAudio).toBeCalledWith(url2)
+ expect(mockAudioInstances.length).toBe(2)
+ expect(mockAudioInstances[0].play).toHaveBeenCalledTimes(0)
+ expect(mockAudioInstances[0].pause).toHaveBeenCalledTimes(1)
+ expect(mockAudioInstances[1].play).toHaveBeenCalledTimes(1)
+ expect(mockAudioInstances[1].pause).toHaveBeenCalledTimes(0)
+ })
+
+ it('listen', () => {
+ const url = 'https://e.b/play.mp3'
+ expect(audio.load(url)).toBe(mockAudioInstances[0])
+ expect(mockAudio).toBeCalledWith(url)
+ const listener = () => {}
+ audio.addListener('play', listener)
+ expect(mockAudioInstances[0].addEventListener).toBeCalledWith('play', listener)
+ })
+})
|
refactor
|
refector audio manager
|
0717ba44bc79be1ffb4790e797852e34a47dd0d8
|
2018-05-04 10:17:26
|
CRIMX
|
build(env): fix fake env
| false
|
diff --git a/config/webpack.config.dev.js b/config/webpack.config.dev.js
index 1eb27995a..d2e07283c 100644
--- a/config/webpack.config.dev.js
+++ b/config/webpack.config.dev.js
@@ -293,8 +293,9 @@ module.exports = {
// Tailor locales
new webpack.ContextReplacementPlugin(/moment[\\/]locale$/, /^\.\/(en|zh-cn|zh-tw)$/),
new WrapperPlugin({
- test: /webextension-page\.js$/,
- footer: ';(function () {\n' + fackBgEnv + '\n})();'
+ test: /background\.js$/,
+ header: ';(function () {\n' + fackBgEnv + '\n',
+ footer: '\n})();'
})
],
// Some libraries import Node modules but don't use them in the browser.
|
build
|
fix fake env
|
8f13ee98ae6910c56c0960ebe1b5404024e7bf65
|
2018-08-30 15:38:28
|
CRIMX
|
test(helpers): add test for config manager
| false
|
diff --git a/src/_helpers/__mocks__/config-manager.ts b/src/_helpers/__mocks__/config-manager.ts
index 340a32d75..faa63c3c1 100644
--- a/src/_helpers/__mocks__/config-manager.ts
+++ b/src/_helpers/__mocks__/config-manager.ts
@@ -10,44 +10,39 @@ import { map } from 'rxjs/operators/map'
const listeners = new Set()
-export type AppConfigChanged = {
- config: StorageChange<AppConfig>
+export interface AppConfigChanged {
+ newConfig: AppConfig,
+ oldConfig?: AppConfig,
}
-export const getActiveConfig = jest.fn(() => Promise.resolve(appConfigFactory()))
+export const addConfig = jest.fn(() => Promise.resolve())
+
+export const removeConfig = jest.fn(() => Promise.resolve())
+
+export const getActiveConfig = jest.fn(() => Promise.resolve(appConfigFactory('config')))
+
+export const updateConfigIDList = jest.fn(() => Promise.resolve())
+
+export const updateActiveConfigID = jest.fn(() => Promise.resolve())
export const updateActiveConfig = jest.fn((config: AppConfig) => Promise.resolve())
-export const addAppConfigListener = jest.fn((cb: StorageListenerCb) => {
+export const addActiveConfigListener = jest.fn((cb: StorageListenerCb) => {
listeners.add(cb)
})
-export const removeAppConfigListener = jest.fn((cb: StorageListenerCb) => {
- listeners.delete(cb)
-})
-
/**
* Get AppConfig and create a stream listening config changing
*/
export const createActiveConfigStream = jest.fn((): Observable<AppConfig> => {
return concat<AppConfig>(
- of(appConfigFactory()),
- fromEventPattern<AppConfigChanged>(
- handler => addAppConfigListener(handler),
- handler => removeAppConfigListener(handler),
- ).pipe(
- map(args => (Array.isArray(args) ? args[0] : args).config.newValue)
+ of(appConfigFactory('config')),
+ fromEventPattern<AppConfigChanged | [AppConfigChanged]>(addActiveConfigListener).pipe(
+ map(args => (Array.isArray(args) ? args[0] : args).newConfig)
)
)
})
-export function dispatchAppConfigEvent (newValue?: AppConfig, oldValue?: AppConfig) {
- listeners.forEach(cb => cb({ config: { newValue: newValue, oldValue: oldValue } }, 'sync'))
-}
-
-export const appConfig = {
- get: getActiveConfig,
- set: updateActiveConfig,
- addListener: addAppConfigListener,
- createStream: createActiveConfigStream,
+export function dispatchActiveConfigChangedEvent (newConfig: AppConfig, oldConfig?: AppConfig) {
+ listeners.forEach(cb => cb({ newConfig, oldConfig }))
}
diff --git a/test/specs/_helpers/config-manager.spec.ts b/test/specs/_helpers/config-manager.spec.ts
new file mode 100644
index 000000000..a1acd48a2
--- /dev/null
+++ b/test/specs/_helpers/config-manager.spec.ts
@@ -0,0 +1,241 @@
+import * as configManager from '@/_helpers/config-manager'
+import { appConfigFactory, AppConfig } from '@/app-config'
+import sinon from 'sinon'
+import { timer } from '@/_helpers/promise-more'
+import { pick } from 'lodash'
+
+function fakeStorageGet (store) {
+ browser.storage.sync.get.callsFake(keys => {
+ return Promise.resolve(
+ keys ? pick(store, Array.isArray(keys) ? keys : [keys]) : store
+ )
+ })
+}
+
+describe('Config Manager', () => {
+ beforeEach(() => {
+ browser.flush()
+ browser.storage.sync.set.callsFake(() => Promise.resolve())
+ browser.storage.sync.remove.callsFake(() => Promise.resolve())
+ })
+
+ it('should init with default config the first time', async () => {
+ fakeStorageGet({})
+
+ const config = await configManager.initConfig()
+ expect(config).toMatchObject({ name: expect.stringContaining('default') })
+ expect(browser.storage.sync.set.calledOnceWith(sinon.match({
+ configModeIDs: sinon.match.array,
+ activeConfigID: sinon.match.string,
+ }))).toBeTruthy()
+ })
+
+ it('should keep existing configs when init', async () => {
+ const config1 = appConfigFactory('id1')
+ const config2 = appConfigFactory('id2')
+ fakeStorageGet({
+ configModeIDs: ['id1', 'id2'],
+ activeConfigID: 'id2',
+ id1: config1,
+ id2: config2,
+ })
+
+ const config = await configManager.initConfig()
+ expect(config).toEqual(config2)
+ expect(browser.storage.sync.set.calledOnceWith(sinon.match({
+ configModeIDs: ['id1', 'id2'],
+ activeConfigID: 'id2',
+ id1: config1,
+ id2: config2,
+ }))).toBeTruthy()
+ })
+
+ it('should reset to default config', async () => {
+ const config1 = appConfigFactory('id1')
+ const config2 = appConfigFactory('id2')
+ fakeStorageGet({
+ configModeIDs: ['id1', 'id2'],
+ activeConfigID: 'id2',
+ id1: config1,
+ id2: config2,
+ })
+
+ const config = await configManager.resetConfig()
+ expect(config).toMatchObject({ name: expect.stringContaining('default') })
+ expect(browser.storage.sync.remove.called).toBeTruthy()
+ expect(browser.storage.sync.set.calledOnceWith(sinon.match({
+ configModeIDs: sinon.match.array,
+ activeConfigID: sinon.match.string,
+ }))).toBeTruthy()
+ })
+
+ it('should add config', async () => {
+ const config1 = appConfigFactory('id1')
+ const config2 = appConfigFactory('id2')
+ fakeStorageGet({
+ configModeIDs: ['id1', 'id2'],
+ activeConfigID: 'id2',
+ id1: config1,
+ id2: config2,
+ })
+
+ const config3 = appConfigFactory('id3')
+ await configManager.addConfig(config3)
+ expect(browser.storage.sync.set.calledWith({
+ configModeIDs: ['id1', 'id2', 'id3'],
+ id3: config3
+ })).toBeTruthy()
+ })
+
+ it('should remove config', async () => {
+ const config1 = appConfigFactory('id1')
+ const config2 = appConfigFactory('id2')
+ fakeStorageGet({
+ configModeIDs: ['id1', 'id2'],
+ activeConfigID: 'id2',
+ id1: config1,
+ id2: config2,
+ })
+
+ await configManager.removeConfig('id1')
+ expect(browser.storage.sync.remove.calledWith('id1')).toBeTruthy()
+ expect(browser.storage.sync.set.calledWith({
+ configModeIDs: ['id2'],
+ })).toBeTruthy()
+ })
+
+ it('should get active config', async () => {
+ const config1 = appConfigFactory('id1')
+ const config2 = appConfigFactory('id2')
+ fakeStorageGet({
+ configModeIDs: ['id1', 'id2'],
+ activeConfigID: 'id2',
+ id1: config1,
+ id2: config2,
+ })
+
+ expect(await configManager.getActiveConfig()).toBe(config2)
+ })
+
+ it('should update config ID list', async () => {
+ await configManager.updateConfigIDList(['id2', 'id1'])
+ expect(browser.storage.sync.set.calledWith({
+ configModeIDs: ['id2', 'id1'],
+ })).toBeTruthy()
+ })
+
+ it('should update active config ID', async () => {
+ await configManager.updateActiveConfigID('id1')
+ expect(browser.storage.sync.set.calledWith({
+ activeConfigID: 'id1',
+ })).toBeTruthy()
+ })
+
+ it('should update active config', async () => {
+ const config1 = appConfigFactory('id1')
+ await configManager.updateActiveConfig(config1)
+ expect(browser.storage.sync.set.calledWith({
+ id1: config1,
+ })).toBeTruthy()
+ })
+
+ describe('add active config listener', () => {
+ let config1: AppConfig
+ let config2: AppConfig
+ let callback: jest.Mock
+
+ beforeEach(async () => {
+ config1 = appConfigFactory('id1')
+ config2 = appConfigFactory('id2')
+ fakeStorageGet({
+ configModeIDs: ['id1', 'id2'],
+ activeConfigID: 'id2',
+ id1: config1,
+ id2: config2,
+ })
+ callback = jest.fn()
+ await configManager.addActiveConfigListener(callback)
+ })
+
+ it('should add storage event listener', () => {
+ expect(browser.storage.onChanged.addListener.calledOnce).toBeTruthy()
+ })
+
+ it('should fire if active config has changed', async () => {
+ const newConfig2 = { ...config2, name: 'changed name', active: !config2.active }
+ browser.storage.onChanged.dispatch({
+ id2: {
+ newValue: newConfig2,
+ oldValue: config2,
+ }
+ }, 'sync')
+ await timer(0)
+ expect(callback).toBeCalledWith({
+ newConfig: newConfig2,
+ oldConfig: config2,
+ })
+ })
+
+ it('should not fire if active config has not changed', async () => {
+ browser.storage.onChanged.dispatch({
+ id1: {
+ newValue: { ...config1, name: 'changed name', active: !config1.active },
+ oldValue: config1,
+ }
+ }, 'sync')
+ await timer(0)
+ expect(callback).toHaveBeenCalledTimes(0)
+ })
+
+ it('should fire if active config ID has changed', async () => {
+ browser.storage.onChanged.dispatch({
+ activeConfigID: {
+ newValue: 'id1',
+ }
+ }, 'sync')
+ await timer(0)
+ expect(callback).toBeCalledWith({
+ newConfig: config1,
+ })
+ })
+
+ it('should fire if active config ID has changed (with last ID)', async () => {
+ browser.storage.onChanged.dispatch({
+ activeConfigID: {
+ newValue: 'id1',
+ oldValue: 'id2',
+ }
+ }, 'sync')
+ await timer(0)
+ expect(callback).toBeCalledWith({
+ newConfig: config1,
+ oldConfig: config2,
+ })
+ })
+ })
+
+ it('should create active config stream', async () => {
+ const config1 = appConfigFactory('id1')
+ const config2 = appConfigFactory('id2')
+ fakeStorageGet({
+ configModeIDs: ['id1', 'id2'],
+ activeConfigID: 'id2',
+ id1: config1,
+ id2: config2,
+ })
+ const subscriber = jest.fn()
+
+ configManager.createActiveConfigStream().subscribe(subscriber)
+ await timer(0)
+ expect(subscriber).toBeCalledWith(config2)
+
+ browser.storage.onChanged.dispatch({
+ activeConfigID: {
+ newValue: 'id1',
+ oldValue: 'id2',
+ }
+ }, 'sync')
+ await timer(0)
+ expect(subscriber).toBeCalledWith(config1)
+ })
+})
|
test
|
add test for config manager
|
417cb9597fefc1a3f25368891be5859ff60ec81e
|
2018-04-29 17:09:58
|
CRIMX
|
build(webpack): inline svgs
| false
|
diff --git a/config/webpack.config.prod.js b/config/webpack.config.prod.js
index 0b04e910a..916853ea2 100644
--- a/config/webpack.config.prod.js
+++ b/config/webpack.config.prod.js
@@ -139,7 +139,7 @@ module.exports = {
// "url" loader works just like "file" loader but it also embeds
// assets smaller than specified size as data URLs to avoid requests.
{
- test: [/\.bmp$/, /\.gif$/, /\.jpe?g$/, /\.png$/],
+ test: [/\.bmp$/, /\.gif$/, /\.jpe?g$/, /\.png$/, /\.svg$/],
loader: require.resolve('url-loader'),
options: {
limit: 10000,
|
build
|
inline svgs
|
eec0d024f2c445e4183ded082e096f0c114800cb
|
2018-06-13 14:43:46
|
CRIMX
|
fix(popup): qrcode hiding
| false
|
diff --git a/src/popup/Popup.vue b/src/popup/Popup.vue
index 443d6cb34..4ed214e03 100644
--- a/src/popup/Popup.vue
+++ b/src/popup/Popup.vue
@@ -1,7 +1,7 @@
<template>
<div class="popup-container">
<div class="active-switch">
- <svg class="icon-qrcode" @mouseenter="showQRcode" @mouseleave="currentTabUrl = ''"xmlns="http://www.w3.org/2000/svg" viewBox="0 0 612 612">
+ <svg class="icon-qrcode" @mouseenter="showQRcode" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 612 612">
<path d="M0 225v25h250v-25H0zM0 25h250V0H0v25z"/>
<path d="M0 250h25V0H0v250zm225 0h25V0h-25v250zM87.5 162.5h75v-75h-75v75zM362 587v25h80v-25h-80zm0-200h80v-25h-80v25z"/>
<path d="M362 612h25V362h-25v250zm190-250v25h60v-25h-60zm-77.5 87.5v25h50v-25h-50z"/>
@@ -20,7 +20,7 @@
<label for="opt-temp-active"></label>
</div>
<transition name="fade">
- <div class="qrcode-panel" v-if="currentTabUrl">
+ <div class="qrcode-panel" v-if="currentTabUrl" @mouseleave="currentTabUrl = ''">
<qriously :value="currentTabUrl" :size="250" />
<p class="qrcode-panel-title">{{ $t('qrcode_title') }}</p>
</div>
|
fix
|
qrcode hiding
|
e59246853b445f007598b03233bc754d193f87f7
|
2018-04-20 15:57:00
|
CRIMX
|
chore(test): rename file
| false
|
diff --git a/test/specs/components/content/SaladBowlContainer.tsx b/test/specs/components/content/SaladBowlContainer.spec.tsx
similarity index 100%
rename from test/specs/components/content/SaladBowlContainer.tsx
rename to test/specs/components/content/SaladBowlContainer.spec.tsx
|
chore
|
rename file
|
0845d188894bdafe8c97f17b4e8bf642b8d75e48
|
2020-04-01 10:27:01
|
crimx
|
refactor(dicts): update cobuild style
| false
|
diff --git a/src/components/dictionaries/cobuild/_style.shadow.scss b/src/components/dictionaries/cobuild/_style.shadow.scss
index ae56b5f88..1b1d0753e 100644
--- a/src/components/dictionaries/cobuild/_style.shadow.scss
+++ b/src/components/dictionaries/cobuild/_style.shadow.scss
@@ -3354,6 +3354,7 @@
}
.share-overlay,
+.popup-overlay,
.share-button {
display: none !important;
}
|
refactor
|
update cobuild style
|
57057a48842e718a5e2c3d23b90cc1a9569faf97
|
2019-09-03 02:17:49
|
crimx
|
refactor(panel): word editor update text
| false
|
diff --git a/src/content/components/WordEditor/WordEditorPanel.tsx b/src/content/components/WordEditor/WordEditorPanel.tsx
index 4b691919d..1152605c4 100644
--- a/src/content/components/WordEditor/WordEditorPanel.tsx
+++ b/src/content/components/WordEditor/WordEditorPanel.tsx
@@ -1,20 +1,9 @@
import React, { FC, useState } from 'react'
-import {
- Word,
- getWordsByText,
- deleteWords,
- saveWord,
- newWord
-} from '@/_helpers/record-manager'
-import { AppConfig } from '@/app-config'
-import { translateCtx } from '@/_helpers/translateCtx'
-import { useTranslate } from '@/_helpers/i18n'
-import WordCards from './WordCards'
-import { message } from '@/_helpers/browser-api'
import {
useObservable,
useObservableState,
- useObservableCallback
+ useObservableCallback,
+ useSubscription
} from 'observable-hooks'
import { merge, of } from 'rxjs'
import {
@@ -26,6 +15,19 @@ import {
switchMap,
debounceTime
} from 'rxjs/operators'
+import {
+ Word,
+ getWordsByText,
+ deleteWords,
+ saveWord,
+ newWord
+} from '@/_helpers/record-manager'
+import { AppConfig } from '@/app-config'
+import { translateCtx } from '@/_helpers/translateCtx'
+import { useTranslate } from '@/_helpers/i18n'
+import { message } from '@/_helpers/browser-api'
+import { isInternalPage } from '@/_helpers/saladict'
+import WordCards from './WordCards'
export interface WordEditorPanelProps {
word: Word | null
@@ -40,28 +42,27 @@ export const WordEditorPanel: FC<WordEditorPanelProps> = props => {
const { t } = useTranslate(['common', 'content'])
const [isDirty, setDirty] = useState(false)
- const propsWord$$ = useObservable(
+ const propsWord$ = useObservable(
inputs$ =>
inputs$.pipe(
pluck(0),
filter((word): word is Word => !!word),
- startWith(newWord()),
- share()
+ startWith(newWord())
),
[props.word] as const
)
- const [setWord, word$] = useObservableCallback<Word>(word$ =>
- merge(propsWord$$, word$)
+ const [setWord, word$$] = useObservableCallback<Word>(word$ =>
+ share<Word>()(merge(propsWord$, word$))
)
- const word = useObservableState(word$)!
+ const word = useObservableState(word$$)!
const [relatedWords, getRelatedWords] = useObservableState<Word[], void>(
event$ =>
event$.pipe(
debounceTime(200),
- withLatestFrom(propsWord$$),
+ withLatestFrom(word$$),
switchMap(([, word]) => {
if (!word.text) {
return of([])
@@ -75,6 +76,22 @@ export const WordEditorPanel: FC<WordEditorPanelProps> = props => {
[]
)
+ const [onTranslateCtx, translateCtx$] = useObservableCallback(event$ =>
+ event$.pipe(
+ withLatestFrom(word$$),
+ switchMap(([, word]) =>
+ translateCtx(word.context || word.text, props.ctxTrans)
+ )
+ )
+ )
+
+ useSubscription(translateCtx$, trans => {
+ setWord({
+ ...word,
+ trans: word.trans ? word.trans + '\n\n' + trans : trans
+ })
+ })
+
return (
<div className="wordEditor-Panel">
<header className="wordEditor-Header">
@@ -180,20 +197,11 @@ export const WordEditorPanel: FC<WordEditorPanelProps> = props => {
<button
type="button"
className="wordEditor-Note_Btn"
- onClick={() => {
- translateCtx(word.context || word.text, props.ctxTrans)
- .then(trans => {
- setWord({
- ...word,
- trans: word.trans ? word.trans + '\n\n' + trans : trans
- })
- })
- .catch(console.error)
- }}
+ onClick={onTranslateCtx}
>
{t('content:transContext')}
</button>
- {!window.__SALADICT_INTERNAL_PAGE__ && (
+ {!isInternalPage() && (
<button
type="button"
className="wordEditor-Note_Btn"
|
refactor
|
word editor update text
|
3280b501c877a407e1a6e4d39b57644b0fa36399
|
2018-05-12 16:56:31
|
CRIMX
|
style(dicts): remove unused
| false
|
diff --git a/src/components/dictionaries/etymonline/View.tsx b/src/components/dictionaries/etymonline/View.tsx
index 3a38fa571..e77904c55 100644
--- a/src/components/dictionaries/etymonline/View.tsx
+++ b/src/components/dictionaries/etymonline/View.tsx
@@ -1,6 +1,4 @@
import React from 'react'
-import Speaker from '@/components/Speaker'
-import StarRates from '@/components/StarRates'
import { EtymonlineResult } from './engine'
export default class DictEtymonline extends React.PureComponent<{ result: EtymonlineResult }> {
|
style
|
remove unused
|
27999af97a4c1b8f0ce6d53fa9e0e47843e7b4dd
|
2019-01-07 19:03:11
|
CRIMX
|
chore(release): 6.22.8
| false
|
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8b2e3c40a..03e4ccc6f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,23 @@
All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
+<a name="6.22.8"></a>
+## [6.22.8](https://github.com/crimx/ext-saladict/compare/v6.22.7...v6.22.8) (2019-01-07)
+
+
+### Bug Fixes
+
+* blacklist stackedit.io ([775298d](https://github.com/crimx/ext-saladict/commit/775298d)), closes [#277](https://github.com/crimx/ext-saladict/issues/277)
+* encode uri ([6098e34](https://github.com/crimx/ext-saladict/commit/6098e34))
+* ignore &[#8203](https://github.com/crimx/ext-saladict/issues/8203); ([156275b](https://github.com/crimx/ext-saladict/commit/156275b)), closes [#274](https://github.com/crimx/ext-saladict/issues/274)
+
+
+### Performance Improvements
+
+* faster matching sentence head ([3fa2fb6](https://github.com/crimx/ext-saladict/commit/3fa2fb6)), closes [#274](https://github.com/crimx/ext-saladict/issues/274)
+
+
+
<a name="6.22.7"></a>
## [6.22.7](https://github.com/crimx/ext-saladict/compare/v6.22.6...v6.22.7) (2018-12-31)
diff --git a/package.json b/package.json
index e7633d342..56a14844c 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
{
"name": "saladict",
- "version": "6.22.7",
+ "version": "6.22.8",
"description": "Chrome extension and Firefox WebExtension, inline translator powered by mutiple online dictionaries",
"private": true,
"scripts": {
|
chore
|
6.22.8
|
dee2afd831f8570fd3c436c73f4318113e2931a6
|
2018-05-15 10:43:07
|
CRIMX
|
fix(dicts): use innerHTML
| false
|
diff --git a/src/components/dictionaries/cobuild/engine.ts b/src/components/dictionaries/cobuild/engine.ts
index b2f50f0ef..4eaa163bd 100644
--- a/src/components/dictionaries/cobuild/engine.ts
+++ b/src/components/dictionaries/cobuild/engine.ts
@@ -76,7 +76,7 @@ function handleDom (
if ($article) {
result.defs = Array.from($article.querySelectorAll('.prep-order'))
.slice(0, options.sentence)
- .map(d => DOMPurify.sanitize(d.outerHTML))
+ .map(d => DOMPurify.sanitize(d.innerHTML))
}
if (result.title && result.defs && result.defs.length > 0) {
diff --git a/src/components/dictionaries/etymonline/engine.ts b/src/components/dictionaries/etymonline/engine.ts
index 7605645e7..78406990d 100644
--- a/src/components/dictionaries/etymonline/engine.ts
+++ b/src/components/dictionaries/etymonline/engine.ts
@@ -23,6 +23,9 @@ export default function search (
// http to bypass the referer checking
return fetchDirtyDOM('http://www.etymonline.com/search?q=' + text)
.then(doc => handleDom(doc, options))
+ .catch(() => fetchDirtyDOM('https://www.etymonline.com/search?q=' + text)
+ .then(doc => handleDom(doc, options))
+ )
}
function handleDom (
@@ -50,7 +53,7 @@ function handleDom (
let word = ($cf.textContent || '').trim()
$cf.outerHTML = `<a href="https://www.etymonline.com/word/${word}" target="_blank">${word}</a>`
})
- def = DOMPurify.sanitize($def.outerHTML)
+ def = DOMPurify.sanitize($def.innerHTML)
}
if (title && def) {
|
fix
|
use innerHTML
|
3b6c7bf38cc9d9efc66c2449fb768ed835d174e7
|
2020-01-16 20:54:20
|
crimx
|
refactor(content): add saladbow custom style
| false
|
diff --git a/src/content/components/SaladBowl/SaladBowl.container.tsx b/src/content/components/SaladBowl/SaladBowl.container.tsx
index ed8292e5a..9f9d11fb3 100644
--- a/src/content/components/SaladBowl/SaladBowl.container.tsx
+++ b/src/content/components/SaladBowl/SaladBowl.container.tsx
@@ -9,6 +9,7 @@ const mapStateToProps = (
state: StoreState
): Omit<SaladBowlPortalProps, Dispatchers> => ({
show: state.isShowBowl,
+ panelCSS: state.config.panelCSS,
x: state.bowlCoord.x,
y: state.bowlCoord.y,
withAnimation: state.config.animation,
diff --git a/src/content/components/SaladBowl/SaladBowl.portal.tsx b/src/content/components/SaladBowl/SaladBowl.portal.tsx
index 354d7d887..8e85151ca 100644
--- a/src/content/components/SaladBowl/SaladBowl.portal.tsx
+++ b/src/content/components/SaladBowl/SaladBowl.portal.tsx
@@ -6,6 +6,7 @@ const animationTimeout = { enter: 1000, exit: 100, appear: 1000 }
export interface SaladBowlPortalProps extends Omit<SaladBowlProps, 'onHover'> {
show: boolean
+ panelCSS: string
}
/**
@@ -13,7 +14,7 @@ export interface SaladBowlPortalProps extends Omit<SaladBowlProps, 'onHover'> {
* Detach from DOM when not visible.
*/
export const SaladBowlPortal: FC<SaladBowlPortalProps> = props => {
- const { show, ...restProps } = props
+ const { show, panelCSS, ...restProps } = props
const [isHover, setHover] = useState(false)
return (
@@ -21,6 +22,7 @@ export const SaladBowlPortal: FC<SaladBowlPortalProps> = props => {
id="saladict-saladbowl-root"
head={<style>{require('./SaladBowl.shadow.scss').toString()}</style>}
classNames="saladbowl"
+ panelCSS={panelCSS}
in={show || isHover}
timeout={props.withAnimation ? animationTimeout : 0}
>
diff --git a/src/content/components/SaladBowl/SaladBowl.stories.tsx b/src/content/components/SaladBowl/SaladBowl.stories.tsx
index 8db96a7c5..33485bab9 100644
--- a/src/content/components/SaladBowl/SaladBowl.stories.tsx
+++ b/src/content/components/SaladBowl/SaladBowl.stories.tsx
@@ -3,7 +3,7 @@ import { storiesOf } from '@storybook/react'
import { action } from '@storybook/addon-actions'
import { jsxDecorator } from 'storybook-addon-jsx'
import { withPropsTable } from 'storybook-addon-react-docgen'
-import { withKnobs, boolean, number } from '@storybook/addon-knobs'
+import { withKnobs, boolean, number, text } from '@storybook/addon-knobs'
import { SaladBowl } from './SaladBowl'
import { SaladBowlPortal } from './SaladBowl.portal'
import { withLocalStyle } from '@/_helpers/storybook'
@@ -32,6 +32,7 @@ storiesOf('Content Scripts|SaladBowl', module)
.add('SaladBowlPortal', () => (
<SaladBowlPortal
show={boolean('Show', true)}
+ panelCSS={text('Panel CSS', '')}
x={number('mouseX', 30)}
y={number('mouseY', 30)}
withAnimation={boolean('Animation', true)}
@@ -69,6 +70,7 @@ storiesOf('Content Scripts|SaladBowl', module)
</p>
<SaladBowlPortal
show
+ panelCSS={text('Panel CSS', '')}
x={x}
y={y}
withAnimation={boolean('Animation', true)}
|
refactor
|
add saladbow custom style
|
195339a062ec936a06e9115fbdff1b87dad23c2c
|
2018-04-20 17:27:12
|
CRIMX
|
refactor(content): use bundled locales
| false
|
diff --git a/package.json b/package.json
index d5061883c..5a8abf2ce 100644
--- a/package.json
+++ b/package.json
@@ -44,7 +44,6 @@
"highcharts": "^6.0.4",
"html2canvas": "^1.0.0-alpha.9",
"i18next": "^11.2.2",
- "i18next-xhr-backend": "^1.5.1",
"immer": "^1.2.1",
"lodash": "^4.17.4",
"moment": "^2.20.1",
diff --git a/src/content/__fake__/i18n.ts b/src/content/__fake__/i18n.ts
deleted file mode 100644
index bff30b6b4..000000000
--- a/src/content/__fake__/i18n.ts
+++ /dev/null
@@ -1,46 +0,0 @@
-import i18n from 'i18next'
-import mapValues from 'lodash/mapValues'
-import mapKeys from 'lodash/mapKeys'
-import { appConfigFactory } from '@/app-config'
-
-const dictLocales = Object.keys(appConfigFactory().dicts.all)
- .map(dict => {
- const locale = require('@/components/dictionaries/' + dict + '/_locales')
- return {
- ['dict_' + dict]: locale.name,
- ...mapKeys(locale.options, (v, k) => `dict_${dict}_${k}`)
- }
- })
-console.log(dictLocales)
-
-const locales = Object.assign({}, require('@/_locales/messages'), ...dictLocales)
-
-const instance = (i18n as any)
- .init({
- lng: 'zh_CN',
- fallbackLng: 'en',
- debug: process.env.NODE_ENV !== 'production',
- saveMissing: false,
- updateMissing: false,
- load: 'currentOnly',
-
- whitelist: ['en', 'zh_CN', 'zh_TW'],
-
- interpolation: {
- escapeValue: false, // not needed for react!!
- },
-
- resources: {
- zh_CN: {
- translation: mapValues(locales, x => x.message ? x.message.zh_CN : x.zh_CN)
- },
- zh_TW: {
- translation: mapValues(locales, x => x.message ? x.message.zh_TW : x.zh_TW)
- },
- en: {
- translation: mapValues(locales, x => x.message ? x.message.en : x.en)
- },
- },
- })
-
-export default instance
diff --git a/src/content/i18n.ts b/src/content/i18n.ts
index a6038d70b..6ae148712 100644
--- a/src/content/i18n.ts
+++ b/src/content/i18n.ts
@@ -1,9 +1,17 @@
import i18n from 'i18next'
-import XHR from 'i18next-xhr-backend'
import mapValues from 'lodash/mapValues'
+import { appConfigFactory } from '@/app-config'
+
+const dictLocales = Object.keys(appConfigFactory().dicts.all)
+ .reduce((result, id) => {
+ const locale = require('@/components/dictionaries/' + id + '/_locales')
+ result['dict_' + id] = locale.name
+ return result
+ }, {})
+
+const locales = { ...require('@/_locales/content'), ...dictLocales }
const instance = (i18n as any)
- .use(XHR)
.init({
lng: browser.i18n.getUILanguage(),
fallbackLng: 'en',
@@ -18,12 +26,17 @@ const instance = (i18n as any)
escapeValue: false, // not needed for react!!
},
- backend: {
- loadPath: browser.runtime.getURL('_locales') + '/{{lng}}/messages.json',
- addPath: browser.runtime.getURL(''),
- parse: (chromeLocales: string) => mapValues(JSON.parse(chromeLocales), x => x.message),
- crossDomain: true,
- }
+ resources: {
+ zh_CN: {
+ translation: mapValues(locales, x => x.zh_CN)
+ },
+ zh_TW: {
+ translation: mapValues(locales, x => x.zh_TW)
+ },
+ en: {
+ translation: mapValues(locales, x => x.en)
+ },
+ },
})
export default instance
diff --git a/yarn.lock b/yarn.lock
index e8813c498..7dad267d0 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -4141,10 +4141,6 @@ husky@^0.14.3:
normalize-path "^1.0.0"
strip-indent "^2.0.0"
-i18next-xhr-backend@^1.5.1:
- version "1.5.1"
- resolved "https://registry.npmjs.org/i18next-xhr-backend/-/i18next-xhr-backend-1.5.1.tgz#50282610780c6a696d880dfa7f4ac1d01e8c3ad5"
-
i18next@^11.2.2:
version "11.2.2"
resolved "https://registry.npmjs.org/i18next/-/i18next-11.2.2.tgz#88b88bda08789841faa9c32b5266be63777be0cd"
|
refactor
|
use bundled locales
|
09977b14b25621993212d724788100aac24bc229
|
2019-07-10 13:11:14
|
CRIMX
|
chore: make story function a react element
| false
|
diff --git a/.storybook/config.ts b/.storybook/config.ts
index 881921c36..030544b3e 100644
--- a/.storybook/config.ts
+++ b/.storybook/config.ts
@@ -1,3 +1,4 @@
+import React from 'react'
import { configure, addDecorator } from '@storybook/react'
import { withInfo } from '@storybook/addon-info'
@@ -8,6 +9,10 @@ addDecorator(
})
)
+// https://github.com/storybookjs/storybook/issues/5721
+// @ts-ignore
+addDecorator(Story => React.createElement(Story))
+
function loadStories() {
const req = require.context('../src', true, /\.stories\.tsx$/)
req.keys().forEach(filename => req(filename))
|
chore
|
make story function a react element
|
42827bb30499c7b5788be9cb10f6c9f4cf191508
|
2020-09-03 12:39:07
|
crimx
|
fix(panel): remove text loading delay on standalone panel
| false
|
diff --git a/src/background/server.ts b/src/background/server.ts
index d25f3727e..bcc42709b 100644
--- a/src/background/server.ts
+++ b/src/background/server.ts
@@ -142,15 +142,7 @@ export class BackgroundServer {
return
}
- await this.qsPanelManager.create(word)
-
- if (!window.appConfig.qsAuto) {
- await timer(1000)
- await message.send({
- type: 'QS_PANEL_SEARCH_TEXT',
- payload: word
- })
- }
+ await this.qsPanelManager.create(word, true)
}
async searchPageSelection(): Promise<void> {
@@ -172,21 +164,7 @@ export class BackgroundServer {
if (hasCreated) {
await this.qsPanelManager.focus()
} else {
- await this.qsPanelManager.create(word)
- }
-
- if (
- word &&
- (!window.appConfig.qsAuto || window.appConfig.qsPreload !== 'selection')
- ) {
- if (!hasCreated) {
- // Panel may not be ready
- await timer(500)
- }
- await message.send<'QS_PANEL_SEARCH_TEXT'>({
- type: 'QS_PANEL_SEARCH_TEXT',
- payload: word
- })
+ await this.qsPanelManager.create(word, true)
}
}
diff --git a/src/background/windows-manager.ts b/src/background/windows-manager.ts
index 726becc83..447d01a99 100644
--- a/src/background/windows-manager.ts
+++ b/src/background/windows-manager.ts
@@ -149,7 +149,7 @@ export class QsPanelManager {
return originTop - offset.panel
}
- async create(preload?: Word): Promise<void> {
+ async create(preload?: Word, autoSearch?: boolean): Promise<void> {
this.isSidebar = false
let wordString = ''
@@ -174,6 +174,8 @@ export class QsPanelManager {
}
} catch (e) {}
+ const autoSearchString = autoSearch ? '&autoSearch=true' : ''
+
await this.mainWindowsManager.takeSnapshot()
const qsPanelRect = window.appConfig.qssaSidebar
@@ -188,7 +190,7 @@ export class QsPanelManager {
...qsPanelRect,
type: 'popup',
url: browser.runtime.getURL(
- `quick-search.html?sidebar=${window.appConfig.qssaSidebar}${wordString}`
+ `quick-search.html?sidebar=${window.appConfig.qssaSidebar}${wordString}${autoSearchString}`
)
})
} catch (err) {
diff --git a/src/content/redux/init.ts b/src/content/redux/init.ts
index 71d0590d3..a929a9f2f 100644
--- a/src/content/redux/init.ts
+++ b/src/content/redux/init.ts
@@ -317,7 +317,7 @@ async function summonedPanelInit(
}
if (word) {
- if (autoSearch && word.text) {
+ if (word.text && (autoSearch || searchParams.get('autoSearch'))) {
dispatch({ type: 'SEARCH_START', payload: { word } })
} else {
dispatch({ type: 'SUMMONED_PANEL_INIT', payload: word.text })
|
fix
|
remove text loading delay on standalone panel
|
b5d75d88b0c72af7560ed0596d11ccc1de9ea716
|
2018-06-14 17:20:21
|
CRIMX
|
fix(content): regression: use position
| false
|
diff --git a/src/content/components/SaladBowlPortal/_style.scss b/src/content/components/SaladBowlPortal/_style.scss
index 7c6c3eb16..233b4142f 100644
--- a/src/content/components/SaladBowlPortal/_style.scss
+++ b/src/content/components/SaladBowlPortal/_style.scss
@@ -58,8 +58,8 @@ $bowl-width: 30px;
.isAnimate {
&.saladict-SaladBowl {
- will-change: transform !important;
- transition: transform 0.3s ease-out !important;
+ will-change: top, left !important;
+ transition: top 0.3s ease-out, left 0.3s ease-out !important;
&:hover {
.saladict-SaladBowl_Leaf {
@@ -75,6 +75,7 @@ $bowl-width: 30px;
}
&.saladict-SaladBowl-enter {
+ will-change: transform !important;
animation: saladict-SaladBowl_Jelly 1000ms linear;
}
}
diff --git a/src/content/components/SaladBowlPortal/index.tsx b/src/content/components/SaladBowlPortal/index.tsx
index 59faf3279..2acbad34e 100644
--- a/src/content/components/SaladBowlPortal/index.tsx
+++ b/src/content/components/SaladBowlPortal/index.tsx
@@ -31,15 +31,15 @@ export default class SaladBowlPortal extends React.Component<SaladBowlPortalProp
handleBowlEntered = (node: HTMLElement) => {
this.bowl = node
const { x, y } = this.props.bowlRect
- node.style.removeProperty('top')
- node.style.removeProperty('left')
- node.style.setProperty('transform', `translate(${x}px, ${y}px)`, 'important')
+ node.style.setProperty('left', `${x}px`, 'important')
+ node.style.setProperty('top', `${y}px`, 'important')
}
componentDidUpdate () {
if (this.bowl) {
const { x, y } = this.props.bowlRect
- this.bowl.style.setProperty('transform', `translate(${x}px, ${y}px)`, 'important')
+ this.bowl.style.setProperty('left', `${x}px`, 'important')
+ this.bowl.style.setProperty('top', `${y}px`, 'important')
}
}
|
fix
|
regression: use position
|
92ad97148a0d4014ec11429dae29cd7e6c2bc88d
|
2019-05-24 10:38:57
|
CRIMX
|
feat(dicts): add caiyun
| false
|
diff --git a/src/app-config/dicts.ts b/src/app-config/dicts.ts
index 7aac4ebbc..c1009ba0f 100644
--- a/src/app-config/dicts.ts
+++ b/src/app-config/dicts.ts
@@ -111,6 +111,42 @@ export function getALlDicts () {
sentence: 4
}
},
+ caiyun: {
+ lang: '11010000',
+ selectionLang: {
+ english: true,
+ chinese: true,
+ japanese: true,
+ korean: true,
+ french: true,
+ spanish: true,
+ deutsch: true,
+ others: true,
+ },
+ defaultUnfold: {
+ english: true,
+ chinese: true,
+ japanese: true,
+ korean: true,
+ french: true,
+ spanish: true,
+ deutsch: true,
+ others: true,
+ },
+ preferredHeight: 320,
+ selectionWC: {
+ min: 1,
+ max: 999999999999999,
+ },
+ options: {
+ /** Keep linebreaks on PDF */
+ pdfNewline: false,
+ tl: 'default' as 'default' | 'zh' | 'en' | 'ja',
+ },
+ options_sel: {
+ tl: ['default', 'zh', 'en', 'ja'],
+ },
+ },
cambridge: {
lang: '11100000',
selectionLang: {
diff --git a/src/components/dictionaries/caiyun/View.tsx b/src/components/dictionaries/caiyun/View.tsx
new file mode 100644
index 000000000..2b1ee2205
--- /dev/null
+++ b/src/components/dictionaries/caiyun/View.tsx
@@ -0,0 +1,3 @@
+import MachineTrans from '@/components/MachineTrans'
+
+export default MachineTrans
diff --git a/src/components/dictionaries/caiyun/_locales.json b/src/components/dictionaries/caiyun/_locales.json
new file mode 100644
index 000000000..9b58f522f
--- /dev/null
+++ b/src/components/dictionaries/caiyun/_locales.json
@@ -0,0 +1,39 @@
+{
+ "name": {
+ "en": "LingoCloud",
+ "zh_CN": "彩云小译",
+ "zh_TW": "彩雲小譯"
+ },
+ "options": {
+ "pdfNewline": {
+ "en": "Keep linebreaks on PDF",
+ "zh_CN": "PDF 保持换行",
+ "zh_TW": "PDF 保持換行"
+ },
+ "tl": {
+ "en": "Target language",
+ "zh_CN": "目标语言",
+ "zh_TW": "目標語言"
+ },
+ "tl-default": {
+ "en": "Default",
+ "zh_CN": "随扩展语言",
+ "zh_TW": "同介面語言"
+ },
+ "tl-zh": {
+ "en": "简体中文",
+ "zh_CN": "简体中文",
+ "zh_TW": "简体中文"
+ },
+ "tl-en": {
+ "en": "English",
+ "zh_CN": "English",
+ "zh_TW": "English"
+ },
+ "tl-ja": {
+ "en": "Japanese",
+ "zh_CN": "日文",
+ "zh_TW": "日文"
+ }
+ }
+}
diff --git a/src/components/dictionaries/caiyun/_style.scss b/src/components/dictionaries/caiyun/_style.scss
new file mode 100644
index 000000000..e0611a68e
--- /dev/null
+++ b/src/components/dictionaries/caiyun/_style.scss
@@ -0,0 +1 @@
+@import '../../MachineTrans/_style';
diff --git a/src/components/dictionaries/caiyun/engine.ts b/src/components/dictionaries/caiyun/engine.ts
new file mode 100644
index 000000000..b6b8b7072
--- /dev/null
+++ b/src/components/dictionaries/caiyun/engine.ts
@@ -0,0 +1,147 @@
+import {
+ handleNoResult,
+ MachineTranslateResult,
+ handleNetWorkError,
+ SearchFunction,
+ MachineTranslatePayload,
+ GetSrcPageFunction,
+} from '../helpers'
+import { DictSearchResult } from '@/typings/server'
+import { isContainChinese, isContainJapanese } from '@/_helpers/lang-check'
+import { storage } from '@/_helpers/browser-api'
+
+export const getSrcPage: GetSrcPageFunction = (text, config, profile) => {
+ return 'https://fanyi.caiyunapp.com/'
+}
+
+interface CaiyunStorage {
+ // caiyun x-oauth token
+ token: string
+ // token added date, update the token after 15mins
+ tokenDate: number
+}
+
+export type CaiyunResult = MachineTranslateResult
+
+type CaiyunSearchResult = DictSearchResult<CaiyunResult>
+
+const langcodes: ReadonlyArray<string> = [
+ 'zh', 'ja', 'en',
+]
+
+export const search: SearchFunction<CaiyunSearchResult, MachineTranslatePayload> = async (
+ text, config, profile, payload
+) => {
+ const options = profile.dicts.all.google.options
+
+ let sl: string = payload.sl || (
+ isContainJapanese(text) ? 'ja' : isContainChinese(text) ? 'zh' : 'en'
+ )
+
+ let tl: string = payload.tl || (
+ options.tl === 'default'
+ ? config.langCode.startsWith('zh') ? 'zh' : 'en'
+ : options.tl
+ )
+
+ if (sl === tl) {
+ if (isContainJapanese(text)) {
+ sl = 'ja'
+ if (tl === 'ja') {
+ tl = config.langCode.startsWith('zh') ? 'zh' : 'en'
+ }
+ } else if (isContainChinese(text)) {
+ sl = 'zh'
+ if (tl === 'zh') {
+ tl = 'en'
+ }
+ } else {
+ sl = 'en'
+ if (tl === 'en') {
+ tl = 'zh'
+ }
+ }
+ }
+
+ if (payload.isPDF && !options.pdfNewline) {
+ text = text.replace(/\n+/g, ' ')
+ }
+
+ const json = await fetch(
+ 'https://api.interpreter.caiyunai.com/v1/translator',
+ {
+ headers: {
+ 'Accept': 'application/json, text/plain, */*',
+ 'Content-Type': 'application/json;charset=UTF-8',
+ 'DNT': '1',
+ 'Origin': 'https://fanyi.caiyunapp.com',
+ 'Referer': 'https://fanyi.caiyunapp.com/',
+ 'X-Authorization': await getToken(),
+ },
+ credentials: 'omit',
+ method: 'POST',
+ body: JSON.stringify({
+ media: 'text',
+ os_type: 'web',
+ request_id: 'web_fanyi',
+ source: text,
+ trans_type: `${sl}2${tl}`,
+ })
+ }
+ )
+ .then(r => r.json())
+ .catch(handleNetWorkError)
+
+ return handleJSON(json, sl, tl, text)
+}
+
+function handleJSON (
+ json: any, sl: string, tl: string, text: string
+): CaiyunSearchResult | Promise<CaiyunSearchResult> {
+ const trans: string | undefined = json && json.target
+ if (!trans) {
+ return handleNoResult()
+ }
+
+ return {
+ result: {
+ id: 'caiyun',
+ sl, tl, langcodes,
+ trans: {
+ text: trans,
+ audio: `http://tts.baidu.com/text2audio?lan=zh&ie=UTF-8&spd=5&text=${encodeURIComponent(trans)}`
+ },
+ searchText: {
+ text,
+ audio: `http://tts.baidu.com/text2audio?lan=zh&ie=UTF-8&spd=5&text=${encodeURIComponent(text)}`
+ }
+ }
+ }
+}
+
+async function getToken (): Promise<string> {
+ let { dict_caiyun } = await storage.local.get<{'dict_caiyun': CaiyunStorage}>('dict_caiyun')
+ if (!dict_caiyun || (Date.now() - dict_caiyun.tokenDate > 15 * 60000)) {
+ let token = 'token:3975l6lr5pcbvidl6jl2'
+ try {
+ const homepage = await fetch('https://fanyi.caiyunapp.com', { credentials: 'omit' })
+ .then(r => r.text())
+
+ const appjsPath = (homepage.match(/\/static\/js\/app\.\w+\.js/) || [''])[0]
+ if (appjsPath) {
+ const appjs = await fetch('https://fanyi.caiyunapp.com' + appjsPath).then(r => r.text())
+ const matchRes = appjs.match(/token:\w+/)
+ if (matchRes) {
+ token = matchRes[0]
+ }
+ }
+ } catch (e) {/* nothing */}
+ dict_caiyun = {
+ token,
+ tokenDate: Date.now()
+ }
+ storage.local.set({ dict_caiyun })
+ }
+
+ return dict_caiyun.token
+}
diff --git a/src/components/dictionaries/caiyun/favicon.png b/src/components/dictionaries/caiyun/favicon.png
new file mode 100644
index 000000000..28078342a
Binary files /dev/null and b/src/components/dictionaries/caiyun/favicon.png differ
diff --git a/test/specs/components/dictionaries/caiyun/engine.spec.ts b/test/specs/components/dictionaries/caiyun/engine.spec.ts
new file mode 100644
index 000000000..0f15f2eea
--- /dev/null
+++ b/test/specs/components/dictionaries/caiyun/engine.spec.ts
@@ -0,0 +1,47 @@
+import { retry } from '../helpers'
+import { search } from '@/components/dictionaries/caiyun/engine'
+import { getDefaultConfig } from '@/app-config'
+import { getDefaultProfile } from '@/app-config/profiles'
+import { isContainEnglish, isContainJapanese, isContainChinese } from '@/_helpers/lang-check'
+
+describe('Dict/Caiyun/engine', () => {
+ beforeEach(() => {
+ browser.storage.local.get.callsFake(() => Promise.resolve({}))
+ browser.storage.local.set.callsFake(() => Promise.resolve())
+ })
+
+ it('should parse result correctly', () => {
+ if (process.env.CI) {
+ return retry(() =>
+ search('我爱你', getDefaultConfig(), getDefaultProfile(), { isPDF: false })
+ .then(searchResult => {
+ expect(isContainEnglish(searchResult.result.trans.text)).toBeTruthy()
+ expect(searchResult.result.trans.text).toMatch(/love/)
+ expect(searchResult.audio).toBeUndefined()
+ expect(searchResult.result.id).toBe('caiyun')
+ expect(searchResult.result.sl).toBe('zh')
+ expect(searchResult.result.tl).toBe('en')
+ expect(isContainChinese(searchResult.result.searchText.text)).toBeTruthy()
+ expect(typeof searchResult.result.trans.audio).toBe('string')
+ expect(typeof searchResult.result.searchText.audio).toBe('string')
+ })
+ )
+ }
+ })
+
+ it('should parse result correctly with payload', () => {
+ if (process.env.CI) {
+ return retry(() =>
+ search('I love you', getDefaultConfig(), getDefaultProfile(), { sl: 'en', tl: 'ja', isPDF: false })
+ .then(searchResult => {
+ expect(searchResult.result.sl).toBe('en')
+ expect(searchResult.result.tl).toBe('ja')
+ if (process.env.CI) {
+ expect(isContainJapanese(searchResult.result.trans.text)).toBeTruthy()
+ expect(isContainEnglish(searchResult.result.searchText.text)).toBeTruthy()
+ }
+ })
+ )
+ }
+ })
+})
|
feat
|
add caiyun
|
aebd35e6fee099e4ad95eafee064f84e734aa4fe
|
2019-01-07 17:12:23
|
CRIMX
|
refactor: add trans to default template
| false
|
diff --git a/src/components/WordPage/ExportModal.tsx b/src/components/WordPage/ExportModal.tsx
index 727f2677a..0c55e7843 100644
--- a/src/components/WordPage/ExportModal.tsx
+++ b/src/components/WordPage/ExportModal.tsx
@@ -124,7 +124,7 @@ export class ExportModalBody extends React.Component<ExportModalInnerProps, Expo
storage.sync.get<{ wordpageTemplate: string }>('wordpageTemplate')
.then(({ wordpageTemplate }) => {
const template = wordpageTemplate ||
- `${t('content:wordEditorNoteWord')}: %text%\n${t('content:wordEditorNoteContext')}: %context%\n`
+ `${t('content:wordEditorNoteWord')}: %text%\n%trans%\n${t('content:wordEditorNoteContext')}: %context%\n`
this.setState({
template,
processedWords: processWords(rawWords, template),
|
refactor
|
add trans to default template
|
45a153234af8fca426710abc5ccf9760ee8ded58
|
2018-05-28 16:03:02
|
CRIMX
|
fix(options): add max width
| false
|
diff --git a/src/options/Options.vue b/src/options/Options.vue
index 66d392f78..71ce0de73 100644
--- a/src/options/Options.vue
+++ b/src/options/Options.vue
@@ -333,6 +333,7 @@ kbd {
}
.opt-container {
+ max-width: 1280px;
min-width: 800px;
margin-right: 470px;
padding: 0 15px;
|
fix
|
add max width
|
9f5bc725ea78451fc5acd12c31bd4fce12802b8d
|
2018-09-02 15:17:56
|
CRIMX
|
chore(release): 6.13.0
| false
|
diff --git a/CHANGELOG.md b/CHANGELOG.md
index df40ff475..aea1384b8 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,28 @@
All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
+<a name="6.13.0"></a>
+# [6.13.0](https://github.com/crimx/ext-saladict/compare/v6.12.1...v6.13.0) (2018-09-02)
+
+
+### Bug Fixes
+
+* **config:** add met merge config ([74ae476](https://github.com/crimx/ext-saladict/commit/74ae476))
+* **configs:** fix config not updating on init ([7d54aa0](https://github.com/crimx/ext-saladict/commit/7d54aa0))
+* **dicts:** fix etymonline ([c5aeca2](https://github.com/crimx/ext-saladict/commit/c5aeca2))
+* **helpers:** prevent profiles blow up ([a5b7d2f](https://github.com/crimx/ext-saladict/commit/a5b7d2f))
+* **panel:** fix mta search box search text ([244a45c](https://github.com/crimx/ext-saladict/commit/244a45c))
+* **panel:** fix typings ([f312ffe](https://github.com/crimx/ext-saladict/commit/f312ffe))
+* **panel:** safety check ([23e06db](https://github.com/crimx/ext-saladict/commit/23e06db))
+
+
+### Features
+
+* **options:** add options for toggling multiline search box ([df4e241](https://github.com/crimx/ext-saladict/commit/df4e241))
+* **panel:** add multiline search box ([7370fc5](https://github.com/crimx/ext-saladict/commit/7370fc5))
+
+
+
<a name="6.12.1"></a>
## [6.12.1](https://github.com/crimx/ext-saladict/compare/v6.12.0...v6.12.1) (2018-09-01)
diff --git a/package.json b/package.json
index 7b73376fb..e9749a4a2 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
{
"name": "saladict",
- "version": "6.12.1",
+ "version": "6.13.0",
"description": "Chrome extension and Firefox WebExtension, inline translator powered by mutiple online dictionaries",
"private": true,
"scripts": {
|
chore
|
6.13.0
|
9a68f2ce955e612d4a08222faa3f15f432a3b66c
|
2018-04-25 16:46:37
|
CRIMX
|
feat(content): add dict panel
| false
|
diff --git a/src/content/components/DictItem/index.tsx b/src/content/components/DictItem/index.tsx
index efd486b19..c9f768635 100644
--- a/src/content/components/DictItem/index.tsx
+++ b/src/content/components/DictItem/index.tsx
@@ -8,7 +8,12 @@ import { openURL } from '@/_helpers/browser-api'
import { SearchStatus } from '@/content/redux/modules/dictionaries'
-export type DictItemProps = {
+export interface DictItemDispatchers {
+ readonly searchText: () => any
+ readonly updateItemHeight: ({ id, height }: { id: DictID, height: number }) => any
+}
+
+export interface DictItemProps extends DictItemDispatchers {
readonly id: DictID
readonly dictURL: string
readonly fontSize: number
@@ -16,8 +21,6 @@ export type DictItemProps = {
readonly panelWidth: number
readonly searchStatus: SearchStatus
readonly searchResult: any
- readonly searchText: () => any
- readonly updateItemHeight: ({ id, height }: { id: DictID, height: number }) => any
}
export type DictItemState = {
@@ -171,6 +174,7 @@ export class DictItem extends React.PureComponent<DictItemProps & { t: Translati
>
{({ height, opacity }) => (
<div className='panel-DictItem_Body'
+ key={id}
style={{ fontSize, height }}
>
<article ref={this.bodyRef} style={{ opacity }}>
diff --git a/src/content/components/DictPanel/index.tsx b/src/content/components/DictPanel/index.tsx
new file mode 100644
index 000000000..ebacf53ac
--- /dev/null
+++ b/src/content/components/DictPanel/index.tsx
@@ -0,0 +1,94 @@
+import './panel.scss'
+import React from 'react'
+import { DictionariesState } from '../../redux/modules/dictionaries'
+import { AppConfig, DictID } from '@/app-config'
+import { SelectionInfo } from '@/_helpers/selection'
+import PortalFrame from '@/components/PortalFrame'
+
+import MenuBar, { MenuBarDispatchers } from '../MenuBar'
+import DictItem, { DictItemDispatchers } from '../DictItem'
+
+export type DictPanelDispatchers = DictItemDispatchers & MenuBarDispatchers
+
+export interface DictPanelProps extends DictPanelDispatchers {
+ readonly shouldShow: boolean
+
+ readonly isFav: boolean
+ readonly isPinned: boolean
+ readonly dictsInfo: DictionariesState['dicts']
+ readonly config: AppConfig
+
+ readonly frameDidMount: (frame: HTMLIFrameElement) => any
+ readonly frameWillUnmount: () => any
+}
+
+export default class DictPanel extends React.Component<DictPanelProps> {
+ frameHead = process.env.NODE_ENV === 'production'
+ ? `<link type="text/css" rel="stylesheet" href="${browser.runtime.getURL('content.css')}" />`
+ : Array.from(document.querySelectorAll<HTMLLinkElement>('link[rel="stylesheet"]'))
+ .map(link => link.outerHTML)
+ .join('\n')
+
+ shouldComponentUpdate (nextProps: DictPanelProps) {
+ return nextProps.shouldShow
+ }
+
+ render () {
+ const {
+ isFav,
+ isPinned,
+ updateDragArea,
+ searchText,
+ addToNotebook,
+ removeFromNotebook,
+ shareImg,
+ pinPanel,
+ closePanel,
+
+ dictsInfo,
+ config,
+ updateItemHeight,
+ } = this.props
+
+ const allDictsConfig = config.dicts.all
+
+ // wrap iframe into DictPanel so that react
+ // can release memory correctly after removed from DOM
+ return (
+ <PortalFrame
+ className='saladict-DictPanel'
+ name='saladict-frame'
+ frameBorder='0'
+ head={this.frameHead}
+ frameDidMount={this.props.frameDidMount}
+ frameWillUnmount={this.props.frameWillUnmount}
+ >
+ {React.createElement(MenuBar, {
+ isFav,
+ isPinned,
+ updateDragArea,
+ searchText,
+ addToNotebook,
+ removeFromNotebook,
+ shareImg,
+ pinPanel,
+ closePanel,
+ })}
+ <div className='panel-DictContainer'>
+ {Object.keys(dictsInfo).map(id => React.createElement(DictItem, {
+ key: id,
+ id: id as DictID,
+ dictURL: allDictsConfig[id].page,
+ fontSize: config.fontSize,
+ preferredHeight: allDictsConfig[id].preferredHeight,
+ panelWidth: config.panelWidth,
+ searchStatus: dictsInfo[id].searchStatus,
+ searchResult: dictsInfo[id].searchResult,
+ searchText,
+ updateItemHeight,
+ }))}
+ </div>
+ </PortalFrame>
+ )
+ }
+}
diff --git a/src/content/components/DictPanel/panel.scss b/src/content/components/DictPanel/panel.scss
new file mode 100644
index 000000000..0f26f99ba
--- /dev/null
+++ b/src/content/components/DictPanel/panel.scss
@@ -0,0 +1,39 @@
+/*-----------------------------------------------*\
+ Libs
+\*-----------------------------------------------*/
+@import '~normalize.css';
+
+/*-----------------------------------------------*\
+ Base
+\*-----------------------------------------------*/
+html {
+ height: 100%;
+ box-sizing: border-box;
+}
+
+*, *:before, *:after {
+ box-sizing: inherit;
+}
+
+body {
+ overflow: hidden;
+ height: 100%;
+ margin: 0;
+ padding: 0;
+ background-color: #fff;
+ font-size: 14px;
+ font-family: "Helvetica Neue", Helvetica, Arial, "Hiragino Sans GB", "Hiragino Sans GB W3", "Microsoft YaHei UI", "Microsoft YaHei", "WenQuanYi Micro Hei", sans-serif;
+}
+
+.panel-Root {
+ display: flex;
+ flex-direction: column;
+ overflow: hidden;
+ height: 100%;
+}
+
+.panel-DictContainer {
+ flex: 1;
+ overflow-x: hidden;
+ overflow-y: scroll;
+}
diff --git a/src/content/components/DictPanelPortal/_style.scss b/src/content/components/DictPanelPortal/_style.scss
new file mode 100644
index 000000000..495ee2b15
--- /dev/null
+++ b/src/content/components/DictPanelPortal/_style.scss
@@ -0,0 +1,15 @@
+@import '@/_sass_global/variables';
+@import '@/_sass_global/z-indices';
+@import '@/_sass_global/interfaces';
+
+:root:root:root:root:root {
+ .saladict-DictPanel {
+ @extend %reset-important;
+ position: fixed !important;
+ z-index: $global-zindex-tooltip !important;
+ left: 0 !important;
+ top: 0 !important;
+ overflow: hidden !important;
+ box-shadow: rgba(0, 0, 0, 0.8) 0px 4px 23px -6px !important;
+ }
+}
diff --git a/src/content/components/DictPanelPortal/index.tsx b/src/content/components/DictPanelPortal/index.tsx
new file mode 100644
index 000000000..51f4d81bd
--- /dev/null
+++ b/src/content/components/DictPanelPortal/index.tsx
@@ -0,0 +1,181 @@
+import './_style.scss'
+import React from 'react'
+import ReactDOM from 'react-dom'
+import { Spring, config as springConfig, SpringConfig } from 'react-spring'
+import DictPanel, { DictPanelDispatchers, DictPanelProps } from '../DictPanel'
+import { WidgetState } from '../../redux/modules/widget'
+import { SelectionInfo } from '@/_helpers/selection'
+import { SelectionState } from '@/content/redux/modules/selection'
+import { Omit } from '@/typings/helpers'
+
+export type DictPanelPortalDispatchers = Omit<
+ DictPanelDispatchers,
+ 'updateItemHeight' | 'updateDragArea'
+>
+
+export interface DictPanelPortalProps extends DictPanelPortalDispatchers {
+ readonly isFav: boolean
+ readonly isPinned: boolean
+ readonly isMouseOnBowl: boolean
+ readonly dictsInfo: DictPanelProps['dictsInfo']
+ readonly config: DictPanelProps['config']
+ readonly selection: SelectionState
+}
+
+type DictPanelState= {
+ readonly propsSelection: SelectionState | null
+ readonly x: number
+ readonly y: number
+ readonly height: number
+}
+
+export default class DictPanelPortal extends React.Component<DictPanelPortalProps, DictPanelState> {
+ isMount = false
+ root = document.body
+ el = document.createElement('div')
+ frame: HTMLIFrameElement | null = null
+ initStyle = { x: 0, y: 0, height: 30, width: 400, opacity: 0 }
+
+ state = {
+ propsSelection: null,
+ x: 0,
+ y: 0,
+ height: 30
+ }
+
+ static getDerivedStateFromProps (
+ nextProps: DictPanelPortalProps,
+ prevState: DictPanelState
+ ): Partial<DictPanelState> | null {
+ const newSelection = nextProps.selection
+ if (newSelection !== prevState.propsSelection) {
+ // only re-calculate position when new selection is made
+ const newState = { propsSelection: newSelection }
+
+ if (newSelection.selectionInfo.text && !nextProps.isPinned) {
+ // restore height
+ const panelWidth = nextProps.config.panelWidth
+ const panelHeight = 30 + nextProps.config.dicts.selected.length * 30
+ newState['height'] = panelHeight
+
+ // icon position 10px panel position
+ // +-------+ +------------------------+
+ // | | | |
+ // | | 30px | |
+ // 60px +-------+ | |
+ // | 30px | |
+ // | | |
+ // 40px | | |
+ // +-------+ | |
+ // cursor
+ const { mouseX, mouseY } = newSelection
+ const wWidth = window.innerWidth
+ const wHeight = window.innerHeight
+
+ let x = mouseX + panelWidth + 80 <= wWidth
+ ? mouseX + 80
+ : mouseX - panelWidth - 80
+ if (x < 0) { x = 5 } // too left
+
+ let y = mouseY > 60 ? mouseY - 60 : mouseY + 60 - 30
+ if (y + panelHeight >= wHeight) {
+ // too down
+ // panel's max height is guaranteed to be 80% so it's safe to do this
+ y = wHeight - panelHeight - 5
+ }
+
+ newState['x'] = x
+ newState['y'] = y
+ }
+
+ return newState
+ }
+
+ return null
+ }
+
+ frameDidMount = (frame: HTMLIFrameElement) => {
+ this.frame = frame
+ }
+
+ mountEL = () => {
+ this.root.appendChild(this.el)
+ this.isMount = true
+ }
+
+ unmountEL = () => {
+ this.root.removeChild(this.el)
+ this.isMount = false
+ }
+
+ frameWillUnmount = () => {
+ this.frame = null
+ setTimeout(this.unmountEL, 100)
+ }
+
+ animateFrame = ({ x, y, height, width, opacity }) => {
+ if (this.frame) {
+ const iframeStyle = this.frame.style
+ iframeStyle.setProperty('width', width + 'px', 'important')
+ iframeStyle.setProperty('hegiht', height + 'px', 'important')
+ iframeStyle.setProperty('transform', `translate3d(${x}px, ${y}px, 0)`, 'important')
+ iframeStyle.setProperty('opacity', opacity, 'important')
+ }
+ return null
+ }
+
+ render () {
+ /** @todo */
+ const updateItemHeight = () => console.log('updateItemHeight')
+ const updateDragArea = () => console.log('updateDragArea')
+
+ const { selection, config, isPinned, isMouseOnBowl } = this.props
+
+ const { x, y, height } = this.state
+
+ const { direct, ctrl, icon, double } = config.mode
+ const shouldShow: boolean = Boolean(
+ this.isMount
+ ? isPinned || selection.selectionInfo.text
+ : isMouseOnBowl || (
+ selection.selectionInfo.text && (
+ direct ||
+ (double && selection.dbClick) ||
+ (ctrl && selection.ctrlKey)
+ )
+ )
+ )
+
+ if (shouldShow) {
+ if (!this.isMount) {
+ this.mountEL()
+ }
+ }
+
+ return ReactDOM.createPortal(
+ <>
+ {shouldShow
+ ? <DictPanel
+ {...this.props}
+ shouldShow={shouldShow}
+ updateItemHeight={updateItemHeight}
+ updateDragArea={updateDragArea}
+ frameDidMount={this.frameDidMount}
+ frameWillUnmount={this.frameWillUnmount}
+ />
+ : null
+ }
+ <Spring
+ from={this.initStyle}
+ to={{
+ x, y, height,
+ width: this.props.config.panelWidth,
+ opacity: shouldShow ? 1 : 0
+ }}
+ immediate={!shouldShow}
+ >{this.animateFrame}</Spring>
+ </>,
+ this.el,
+ )
+ }
+}
diff --git a/src/content/components/MenuBar/index.tsx b/src/content/components/MenuBar/index.tsx
index f8c992593..b65e72e5b 100644
--- a/src/content/components/MenuBar/index.tsx
+++ b/src/content/components/MenuBar/index.tsx
@@ -1,15 +1,13 @@
import './_style.scss'
import React, { KeyboardEvent, MouseEvent } from 'react'
import { translate } from 'react-i18next'
+import { message } from '@/_helpers/browser-api'
import { TranslationFunction } from 'i18next'
import { MsgType, MsgOpenUrl } from '@/typings/message'
-import { message } from '@/_helpers/browser-api'
-export type MenuBarProps = {
- readonly isFav: boolean
- readonly isPinned: boolean
+export interface MenuBarDispatchers {
readonly updateDragArea: ({ left, width }: { left: number, width: number }) => any
- readonly searchText: (text: string) => any
+ readonly searchText: ({ info }: { info: string }) => any
readonly addToNotebook: () => any
readonly removeFromNotebook: () => any
readonly shareImg: () => any
@@ -17,7 +15,13 @@ export type MenuBarProps = {
readonly closePanel: () => any
}
+export interface MenuBarProps extends MenuBarDispatchers {
+ readonly isFav: boolean
+ readonly isPinned: boolean
+}
+
export class MenuBar extends React.PureComponent<MenuBarProps & { t: TranslationFunction }> {
+ inputRef = React.createRef<HTMLInputElement>()
dragAreaRef = React.createRef<HTMLDivElement>()
text = ''
@@ -52,13 +56,13 @@ export class MenuBar extends React.PureComponent<MenuBarProps & { t: Translation
handleSearchBoxKeyUp = (e: KeyboardEvent<HTMLInputElement>) => {
if (this.text && e.key === 'Enter') {
- this.props.searchText(this.text)
+ this.props.searchText({ info: this.text })
}
}
handleIconSearchClick = (e: MouseEvent<SVGElement>) => {
if (this.text) {
- this.props.searchText(this.text)
+ this.props.searchText({ info: this.text })
}
}
@@ -83,6 +87,12 @@ export class MenuBar extends React.PureComponent<MenuBarProps & { t: Translation
}
}
+ componentDidMount () {
+ if (this.inputRef.current) {
+ this.inputRef.current.focus()
+ }
+ }
+
render () {
const {
t,
@@ -97,6 +107,7 @@ export class MenuBar extends React.PureComponent<MenuBarProps & { t: Translation
<header className='panel-MenuBar'>
<input type='text'
className='panel-MenuBar_SearchBox'
+ ref={this.inputRef}
onInput={this.handleSearchBoxInput}
onKeyUp={this.handleSearchBoxKeyUp}
onTransitionEnd={this.updateDragArea}
diff --git a/src/content/containers/DictPanelContainer.tsx b/src/content/containers/DictPanelContainer.tsx
new file mode 100644
index 000000000..5f93bb6a9
--- /dev/null
+++ b/src/content/containers/DictPanelContainer.tsx
@@ -0,0 +1,37 @@
+import { connect } from 'react-redux'
+import DictPanelPortal, { DictPanelPortalProps, DictPanelPortalDispatchers } from '../components/DictPanelPortal'
+import { StoreState } from '../redux/modules'
+import { searchText } from '../redux/modules/dictionaries'
+import { addToNotebook, removeFromNotebook, pinPanel } from '../redux/modules/widget'
+
+export const mapStateToProps = ({
+ config,
+ selection,
+ widget,
+ dictionaries,
+}: StoreState) => {
+ return {
+ config,
+ selection,
+ isFav: widget.isFav,
+ isPinned: widget.isPinned,
+ isMouseOnBowl: widget.isMouseOnBowl,
+ dictsInfo: dictionaries.dicts,
+ }
+}
+
+export const mapDispatchToProps: { [k in keyof DictPanelPortalDispatchers]: Function } = {
+ searchText,
+
+ addToNotebook,
+ removeFromNotebook,
+ pinPanel,
+
+ shareImg: () => {/** @todo */},
+ closePanel: () => {/** @todo */},
+}
+
+export default connect(
+ mapStateToProps,
+ mapDispatchToProps,
+)(DictPanelPortal)
diff --git a/src/content/content.scss b/src/content/content.scss
index 9929f0ecf..6f3a20c4d 100644
--- a/src/content/content.scss
+++ b/src/content/content.scss
@@ -4,9 +4,3 @@
@import '../_sass_global/variables';
@import '../_sass_global/z-indices';
@import '../_sass_global/interfaces';
-
-
-/*-----------------------------------------------*\
- Components
-\*-----------------------------------------------*/
-@import './components/SaladBowl/style';
diff --git a/src/content/index.tsx b/src/content/index.tsx
index d431b8e97..019fb58cf 100644
--- a/src/content/index.tsx
+++ b/src/content/index.tsx
@@ -3,6 +3,7 @@ import ReactDOM from 'react-dom'
import { Provider as ProviderRedux } from 'react-redux'
import SaladBowlContainer from './containers/SaladBowlContainer'
+import DictPanelContainer from './containers/DictPanelContainer'
import createStore from './redux/create'
import { I18nextProvider as ProviderI18next } from 'react-i18next'
@@ -15,7 +16,10 @@ const store = createStore()
const App = () => (
<ProviderRedux store={store}>
<ProviderI18next i18n={i18n}>
- <SaladBowlContainer />
+ <div>
+ <SaladBowlContainer />
+ <DictPanelContainer />
+ </div>
</ProviderI18next>
</ProviderRedux>
)
|
feat
|
add dict panel
|
9d7740d1b13b481cc6fae79666ed2e6705accb84
|
2022-02-28 17:15:48
|
dependabot[bot]
|
build(deps-dev): bump node-fetch from 2.6.1 to 3.1.1 (#1621)
| false
|
diff --git a/package.json b/package.json
index f5dd2fe0..979e877f 100644
--- a/package.json
+++ b/package.json
@@ -163,7 +163,7 @@
"moment-locales-webpack-plugin": "^1.1.0",
"neutrino": "^9.1.0",
"neutrino-webextension": "^1.2.1",
- "node-fetch": "^2.6.1",
+ "node-fetch": "^3.1.1",
"postcss-loader": "^3.0.0",
"prettier": "^1.19.1",
"qs": "^6.9.1",
diff --git a/yarn.lock b/yarn.lock
index 9eae474b..da3353d2 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -5808,6 +5808,11 @@ dashdash@^1.12.0:
dependencies:
assert-plus "^1.0.0"
+data-uri-to-buffer@^4.0.0:
+ version "4.0.0"
+ resolved "https://registry.yarnpkg.com/data-uri-to-buffer/-/data-uri-to-buffer-4.0.0.tgz#b5db46aea50f6176428ac05b73be39a57701a64b"
+ integrity sha512-Vr3mLBA8qWmcuschSLAOogKgQ/Jwxulv3RNE4FXnYWRGujzrRWQI4m12fQqRkwX06C0KanhLr4hK+GydchZsaA==
+
data-urls@^2.0.0:
version "2.0.0"
resolved "https://registry.yarnpkg.com/data-urls/-/data-urls-2.0.0.tgz#156485a72963a970f5d5821aaf642bef2bf2db9b"
@@ -7140,6 +7145,14 @@ fbjs@^0.8.1, fbjs@^0.8.4:
setimmediate "^1.0.5"
ua-parser-js "^0.7.18"
+fetch-blob@^3.1.2, fetch-blob@^3.1.3:
+ version "3.1.4"
+ resolved "https://registry.yarnpkg.com/fetch-blob/-/fetch-blob-3.1.4.tgz#e8c6567f80ad7fc22fd302e7dcb72bafde9c1717"
+ integrity sha512-Eq5Xv5+VlSrYWEqKrusxY1C3Hm/hjeAsCGVG3ft7pZahlUAChpGZT/Ms1WmSLnEAisEXszjzu/s+ce6HZB2VHA==
+ dependencies:
+ node-domexception "^1.0.0"
+ web-streams-polyfill "^3.0.3"
+
figgy-pudding@^3.5.1:
version "3.5.2"
resolved "https://registry.yarnpkg.com/figgy-pudding/-/figgy-pudding-3.5.2.tgz#b4eee8148abb01dcf1d1ac34367d59e12fa61d6e"
@@ -7412,6 +7425,13 @@ format@^0.2.0:
resolved "https://registry.yarnpkg.com/format/-/format-0.2.2.tgz#d6170107e9efdc4ed30c9dc39016df942b5cb58b"
integrity sha1-1hcBB+nv3E7TDJ3DkBbflCtctYs=
+formdata-polyfill@^4.0.10:
+ version "4.0.10"
+ resolved "https://registry.yarnpkg.com/formdata-polyfill/-/formdata-polyfill-4.0.10.tgz#24807c31c9d402e002ab3d8c720144ceb8848423"
+ integrity sha512-buewHzMvYL29jdeQTVILecSaZKnt/RJWjoZCF5OW60Z67/GmSLBkOFM7qh1PI3zFNtJbaZL5eQu1vLfazOwj4g==
+ dependencies:
+ fetch-blob "^3.1.2"
+
forwarded@~0.1.2:
version "0.1.2"
resolved "https://registry.yarnpkg.com/forwarded/-/forwarded-0.1.2.tgz#98c23dab1175657b8c0573e8ceccd91b0ff18c84"
@@ -10634,6 +10654,11 @@ node-dir@^0.1.10:
dependencies:
minimatch "^3.0.2"
+node-domexception@^1.0.0:
+ version "1.0.0"
+ resolved "https://registry.yarnpkg.com/node-domexception/-/node-domexception-1.0.0.tgz#6888db46a1f71c0b76b3f7555016b63fe64766e5"
+ integrity sha512-/jKZoMpw0F8GRwl4/eLROPA3cfcXtLApP0QzLmUT/HuPCZWyB7IY9ZrMeKw2O/nFIqPQB3PVM9aYm0F312AXDQ==
+
[email protected]:
version "2.1.2"
resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.1.2.tgz#ab884e8e7e57e38a944753cec706f788d1768bb5"
@@ -10647,11 +10672,20 @@ node-fetch@^1.0.1:
encoding "^0.1.11"
is-stream "^1.0.1"
-node-fetch@^2.6.0, node-fetch@^2.6.1:
+node-fetch@^2.6.0:
version "2.6.1"
resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.6.1.tgz#045bd323631f76ed2e2b55573394416b639a0052"
integrity sha512-V4aYg89jEoVRxRb2fJdAg8FHvI7cEyYdVAh94HH0UIK8oJxUfkjlDQN9RbMx+bEjP7+ggMiFRprSti032Oipxw==
+node-fetch@^3.1.1:
+ version "3.1.1"
+ resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-3.1.1.tgz#d0d9607e455b3087e3092b821b5b1f1ebf4c2147"
+ integrity sha512-SMk+vKgU77PYotRdWzqZGTZeuFKlsJ0hu4KPviQKkfY+N3vn2MIzr0rvpnYpR8MtB3IEuhlEcuOLbGvLRlA+yg==
+ dependencies:
+ data-uri-to-buffer "^4.0.0"
+ fetch-blob "^3.1.3"
+ formdata-polyfill "^4.0.10"
+
[email protected]:
version "0.9.0"
resolved "https://registry.yarnpkg.com/node-forge/-/node-forge-0.9.0.tgz#d624050edbb44874adca12bb9a52ec63cb782579"
@@ -15188,6 +15222,11 @@ wbuf@^1.1.0, wbuf@^1.7.3:
dependencies:
minimalistic-assert "^1.0.0"
+web-streams-polyfill@^3.0.3:
+ version "3.2.0"
+ resolved "https://registry.yarnpkg.com/web-streams-polyfill/-/web-streams-polyfill-3.2.0.tgz#a6b74026b38e4885869fb5c589e90b95ccfc7965"
+ integrity sha512-EqPmREeOzttaLRm5HS7io98goBgZ7IVz79aDvqjD0kYXLtFZTc0T/U6wHTPKyIjb+MdN7DFIIX6hgdBEpWmfPA==
+
webextension-polyfill@^0.6.0:
version "0.6.0"
resolved "https://registry.yarnpkg.com/webextension-polyfill/-/webextension-polyfill-0.6.0.tgz#1afd925f3274a0d4848083579b9c0b649a5c6763"
|
build
|
bump node-fetch from 2.6.1 to 3.1.1 (#1621)
|
d36e38124b8c6f1420677bdcfee9fb13cc2d2fa1
|
2020-08-30 13:51:24
|
crimx
|
refactor(dicts): fix googledict dark mode
| false
|
diff --git a/src/components/dictionaries/googledict/_style.shadow.scss b/src/components/dictionaries/googledict/_style.shadow.scss
index 9621d780a..1ea28322e 100644
--- a/src/components/dictionaries/googledict/_style.shadow.scss
+++ b/src/components/dictionaries/googledict/_style.shadow.scss
@@ -75,3 +75,18 @@ img {
.SDZsVb {
color: #f9690e !important;
}
+
+// @TODO hide "See definitions in:" for now
+[jsname=p0q1Sd] {
+ display: none !important;
+}
+
+// tags button color
+.MR2UAc {
+ background: var(--color-background) !important;
+ border: 1px solid var(--color-divider) !important;
+}
+
+.jEdCLc, .D1MTm {
+ color: var(--color-font-grey) !important;
+}
|
refactor
|
fix googledict dark mode
|
39ccfbf69a64b05be71b8d1f8338eb04e5e26ade
|
2018-06-05 10:26:16
|
CRIMX
|
refactor(panel): add isAnimate to body
| false
|
diff --git a/src/content/components/DictPanel/index.tsx b/src/content/components/DictPanel/index.tsx
index 8812379f3..d5c1e9e2d 100644
--- a/src/content/components/DictPanel/index.tsx
+++ b/src/content/components/DictPanel/index.tsx
@@ -95,48 +95,47 @@ export default class DictPanel extends React.Component<DictPanelProps> {
return (
<PortalFrame
className={frameClassName}
+ bodyClassName={isAnimation ? 'isAnimate' : undefined}
name='saladict-frame'
frameBorder='0'
head={this.frameHead}
frameDidMount={this.props.frameDidMount}
frameWillUnmount={this.props.frameWillUnmount}
>
- <div className={isAnimation ? 'isAnimate' : undefined}>
- {React.createElement(MenuBar, {
- isFav,
- isPinned,
- searchHistory: dictionaries.searchHistory,
- handleDragAreaMouseDown,
- handleDragAreaTouchStart,
- searchText,
- openWordEditor,
- shareImg,
- panelPinSwitch,
- closePanel,
- })}
- <div className='panel-DictContainer'>
- {activeDicts.map(id => {
- let dictURL = allDictsConfig[id].page
- if (typeof dictURL !== 'string') {
- dictURL = dictURL[langCode] || dictURL.en
- }
+ {React.createElement(MenuBar, {
+ isFav,
+ isPinned,
+ searchHistory: dictionaries.searchHistory,
+ handleDragAreaMouseDown,
+ handleDragAreaTouchStart,
+ searchText,
+ openWordEditor,
+ shareImg,
+ panelPinSwitch,
+ closePanel,
+ })}
+ <div className='panel-DictContainer'>
+ {activeDicts.map(id => {
+ let dictURL = allDictsConfig[id].page
+ if (typeof dictURL !== 'string') {
+ dictURL = dictURL[langCode] || dictURL.en
+ }
- return React.createElement(DictItem, {
- key: id,
- id,
- text: (dictionaries.searchHistory[0] || selection.selectionInfo).text,
- dictURL,
- fontSize,
- preferredHeight: allDictsConfig[id].preferredHeight,
- panelWidth,
- isAnimation,
- searchStatus: (dictsInfo[id] as any).searchStatus,
- searchResult: (dictsInfo[id] as any).searchResult,
- searchText,
- updateItemHeight,
- })
- })}
- </div>
+ return React.createElement(DictItem, {
+ key: id,
+ id,
+ text: (dictionaries.searchHistory[0] || selection.selectionInfo).text,
+ dictURL,
+ fontSize,
+ preferredHeight: allDictsConfig[id].preferredHeight,
+ panelWidth,
+ isAnimation,
+ searchStatus: (dictsInfo[id] as any).searchStatus,
+ searchResult: (dictsInfo[id] as any).searchResult,
+ searchText,
+ updateItemHeight,
+ })
+ })}
</div>
</PortalFrame>
)
|
refactor
|
add isAnimate to body
|
768ba7851d7e22517a3d4a23dad135c103f229ab
|
2020-05-17 10:40:16
|
crimx
|
fix(macmillan): add styles on labels
| false
|
diff --git a/src/components/dictionaries/macmillan/_style.shadow.scss b/src/components/dictionaries/macmillan/_style.shadow.scss
index 228066602..509e20c89 100644
--- a/src/components/dictionaries/macmillan/_style.shadow.scss
+++ b/src/components/dictionaries/macmillan/_style.shadow.scss
@@ -8,7 +8,7 @@
.dictMacmillan-Header_Info {
margin-left: 10px;
- color: #aaa;
+ color: var(--color-font-grey);
}
.dictMacmillan-Title {
@@ -120,8 +120,8 @@ h2.PHRASE-VARIANT {
.EXAMPLES {
margin-bottom: 5px;
padding-left: 10px;
- color: #777;
- border-left: #777 solid 1px;
+ color: var(--color-font-grey);
+ border-left: var(--color-divider) solid 1px;
font-style: italic;
strong {
@@ -130,7 +130,7 @@ h2.PHRASE-VARIANT {
a:link,
a:visited {
- color: #777;
+ color: var(--color-font-grey);
text-decoration: none;
}
@@ -187,8 +187,16 @@ h2.PHRASE-VARIANT {
margin-left: 10px;
}
+.entry-labels *,
+.DIALECT,
+.RESTRICTION-CLASS,
+.STYLE-LEVEL,
+.SUBJECT-AREA,
.SYNTAX-CODING {
- margin-right: 0.5em;
+ margin-right: .4em;
+ text-transform: uppercase;
+ font-size: .8em;
+ color: var(--color-font-grey);
}
.h2 {
@@ -199,14 +207,14 @@ h2.PHRASE-VARIANT {
.centred {
&::before {
content: '>';
- color: #ccc8c8;
+ color: var(--color-font-grey);
}
}
.moreButton {
&:link,
&:visited {
- color: #ccc8c8;
+ color: var(--color-font-grey);
}
}
@@ -254,7 +262,7 @@ h2.PHRASE-VARIANT {
font-size: .9em;
margin: 1.5em -1rem 1em;
padding-right: 1em;
- color: gray;
+ color: var(--color-font-grey);
}
.open-footer-content {
diff --git a/test/specs/components/dictionaries/macmillan/fixtures.js b/test/specs/components/dictionaries/macmillan/fixtures.js
index d36f8ed42..1b9a8dbba 100644
--- a/test/specs/components/dictionaries/macmillan/fixtures.js
+++ b/test/specs/components/dictionaries/macmillan/fixtures.js
@@ -8,6 +8,10 @@ module.exports = {
[
'love_2.html',
'http://www.macmillandictionary.com/dictionary/british/love_2'
+ ],
+ [
+ 'viral.html',
+ 'http://www.macmillandictionary.com/dictionary/british/viral'
]
]
}
diff --git a/test/specs/components/dictionaries/macmillan/requests.mock.ts b/test/specs/components/dictionaries/macmillan/requests.mock.ts
index f7c3c2d0a..0f8c5c908 100644
--- a/test/specs/components/dictionaries/macmillan/requests.mock.ts
+++ b/test/specs/components/dictionaries/macmillan/requests.mock.ts
@@ -1,6 +1,6 @@
import { MockRequest } from '@/components/dictionaries/helpers'
-export const mockSearchTexts = ['love', 'jumblish']
+export const mockSearchTexts = ['love', 'viral', 'jumblish']
export const mockRequest: MockRequest = mock => {
mock.onGet(/macmillan/).reply(info => {
|
fix
|
add styles on labels
|
b0a4eba2a78f89df475452689a85f6ad41528a3e
|
2019-08-01 21:39:08
|
crimx
|
refactor: use react-resize-reporter
| false
|
diff --git a/package.json b/package.json
index 52a0d7fd7..77da432dc 100644
--- a/package.json
+++ b/package.json
@@ -58,6 +58,7 @@
"react-dom": "^16",
"react-hot-loader": "^4",
"react-i18next": "^10.11.4",
+ "react-resize-reporter": "^0.1.0",
"react-shadow": "^17.1.1",
"react-transition-group": "^4.2.1",
"rxjs": "^6.5.2",
diff --git a/src/components/dictionaries/helpers.ts b/src/components/dictionaries/helpers.ts
index 063382859..81948fe08 100644
--- a/src/components/dictionaries/helpers.ts
+++ b/src/components/dictionaries/helpers.ts
@@ -24,11 +24,11 @@ export type HTMLString = string
export interface ViewPorps<T> {
result: T
- t: TranslationFunction
- searchText: <P = { [index: string]: any }>(
- arg?: { id?: DictID, info?: SelectionInfo, payload?: P }
- ) => any
- recalcBodyHeight: () => void
+ searchText: <P = { [index: string]: any }>(arg?: {
+ id?: DictID
+ word?: Word
+ payload?: P
+ }) => any
}
export const enum SearchErrorType {
diff --git a/src/content/components/DictItem/DictItem.scss b/src/content/components/DictItem/DictItem.scss
index 26a7ebeb4..76c89f7f9 100644
--- a/src/content/components/DictItem/DictItem.scss
+++ b/src/content/components/DictItem/DictItem.scss
@@ -20,6 +20,8 @@
// when changing the parent height
overflow: hidden;
opacity: 0;
+ // react-resize-reporter
+ position: relative;
> *:first-child {
margin-top: 10px !important;
diff --git a/src/content/components/DictItem/DictItem.stories.tsx b/src/content/components/DictItem/DictItem.stories.tsx
index 4e4d44074..bd88f1cc1 100644
--- a/src/content/components/DictItem/DictItem.stories.tsx
+++ b/src/content/components/DictItem/DictItem.stories.tsx
@@ -54,6 +54,7 @@ storiesOf('Content Scripts|DictItem', module)
</>
)}
searchText={action('Search Text')}
+ onHeightChanged={action('Height Changed')}
/>
)
})
diff --git a/src/content/components/DictItem/DictItem.tsx b/src/content/components/DictItem/DictItem.tsx
index 3fe40af2f..ba76842a1 100644
--- a/src/content/components/DictItem/DictItem.tsx
+++ b/src/content/components/DictItem/DictItem.tsx
@@ -1,37 +1,20 @@
-import React, {
- ComponentType,
- FC,
- useState,
- useRef,
- useCallback,
- useEffect
-} from 'react'
-import root from 'react-shadow'
+import React, { ComponentType, FC, useState, useRef, useEffect } from 'react'
import { message } from '@/_helpers/browser-api'
-import { Word, newWord } from '@/_helpers/record-manager'
-import { DictID } from '@/app-config'
+import { newWord } from '@/_helpers/record-manager'
import { ViewPorps } from '@/components/dictionaries/helpers'
-import { ErrorBoundary } from '@/components/ErrorBoundary'
import { DictItemHead } from './DictItemHead'
+import { DictItemBody, DictItemBodyProps } from './DictItemBody'
+import { ResizeReporter } from 'react-resize-reporter'
-export interface DictItem {
- dictID: DictID
+export interface DictItem extends DictItemBodyProps {
text: string
fontSize: number
/** default height when search result is received */
preferredHeight: number
-
- searchStatus: 'IDLE' | 'SEARCHING' | 'FINISH'
- searchResult?: object | null
-
/** Inject dict component. Mainly for testing */
dictComp?: ComponentType<ViewPorps<any>>
-
- searchText: (arg?: {
- id?: DictID
- word?: Word
- payload?: { [index: string]: any }
- }) => any
+ /** report dict item height */
+ onHeightChanged: (height: number) => void
}
export const DictItem: FC<DictItem> = props => {
@@ -39,28 +22,28 @@ export const DictItem: FC<DictItem> = props => {
'COLLAPSE'
)
/** Rendered height */
- const [visibleHeight, setVisibleHeight] = useState(10)
+ const [offsetHeight, setOffsetHeight] = useState(0)
+
+ const visibleHeight = Math.max(
+ 10,
+ foldState === 'COLLAPSE'
+ ? 10
+ : foldState === 'FULL'
+ ? offsetHeight
+ : Math.min(offsetHeight, props.preferredHeight)
+ )
- const bodyRef = useRef<HTMLElement>(null)
+ useEffect(() => {
+ props.onHeightChanged(visibleHeight + 31)
+ }, [visibleHeight])
useEffect(() => {
if (props.searchStatus === 'FINISH') {
- // wait till render complete
- setTimeout(unfold, 0)
+ setFoldState('HALF')
} else {
- fold()
+ setFoldState('COLLAPSE')
}
- }, [props.searchStatus, props.searchResult])
-
- const recalcBodyHeight = useCallback(
- () =>
- setTimeout(() => {
- if (bodyRef.current) {
- setVisibleHeight(Math.max(bodyRef.current.offsetHeight || 10, 10))
- }
- }, 0),
- [bodyRef.current]
- )
+ }, [props.searchStatus])
return (
<section
@@ -76,69 +59,44 @@ export const DictItem: FC<DictItem> = props => {
className="dictItem-Body"
key={props.dictID}
style={{ fontSize: props.fontSize, height: visibleHeight }}
+ onClick={searchLinkText}
>
- <article
- ref={bodyRef}
- className="dictItem-BodyMesure"
- onClick={searchLinkText}
- >
- <ErrorBoundary error={DictRenderError}>
- {props.searchStatus === 'FINISH' &&
- props.searchResult &&
- (props.dictComp ? (
- React.createElement(props.dictComp, {
- result: props.searchResult,
- searchText: props.searchText,
- recalcBodyHeight
- })
- ) : (
- <root.div>
- <style>
- {require('@/components/dictionaries/' +
- props.dictID +
- '/_style.shadow.scss').toString()}
- </style>
- {React.createElement<ViewPorps<any>>(
- require('@/components/dictionaries/' +
- props.dictID +
- '/View.tsx').default,
- {
- result: props.searchResult,
- searchText: props.searchText,
- recalcBodyHeight
- }
- )}
- </root.div>
- ))}
- </ErrorBoundary>
+ <article className="dictItem-BodyMesure">
+ <ResizeReporter reportInit onHeightChanged={setOffsetHeight} />
+ {props.dictComp ? (
+ props.searchStatus === 'FINISH' &&
+ props.searchResult &&
+ React.createElement(props.dictComp, {
+ result: props.searchResult,
+ searchText: props.searchText
+ })
+ ) : (
+ <DictItemBody {...props} />
+ )}
</article>
- {foldState === 'HALF' && props.searchResult && (
- <button
- className="dictItem-FoldMask"
- onClick={() => {
- if (bodyRef.current) {
- setFoldState('FULL')
- setVisibleHeight(
- Math.max(bodyRef.current.offsetHeight || 10, 10)
- )
- }
- }}
- >
- <svg
- className="dictItem-FoldMaskArrow"
- width="15"
- height="15"
- viewBox="0 0 59.414 59.414"
- xmlns="http://www.w3.org/2000/svg"
+ {foldState === 'HALF' &&
+ visibleHeight < offsetHeight &&
+ props.searchResult && (
+ <button
+ className="dictItem-FoldMask"
+ onClick={() => setFoldState('FULL')}
>
- <path d="M58 14.146L29.707 42.44 1.414 14.145 0 15.56 29.707 45.27 59.414 15.56" />
- </svg>
- </button>
- )}
+ <svg
+ className="dictItem-FoldMaskArrow"
+ width="15"
+ height="15"
+ viewBox="0 0 59.414 59.414"
+ xmlns="http://www.w3.org/2000/svg"
+ >
+ <path d="M58 14.146L29.707 42.44 1.414 14.145 0 15.56 29.707 45.27 59.414 15.56" />
+ </svg>
+ </button>
+ )}
</div>
</section>
)
+ /** Search the content of an <a> instead of jumping unless it's external */
function searchLinkText(e: React.MouseEvent<HTMLElement>) {
if (e.ctrlKey || e.metaKey || e.altKey) {
// ignore if extra key is pressed
@@ -182,49 +140,17 @@ export const DictItem: FC<DictItem> = props => {
}
}
- function fold() {
- setFoldState('COLLAPSE')
- setVisibleHeight(10)
- }
-
- function unfold() {
- const offsetHeight = Math.max(bodyRef.current!.offsetHeight || 10, 10)
- if (offsetHeight <= props.preferredHeight) {
- setVisibleHeight(offsetHeight)
- setFoldState('FULL')
- } else {
- setVisibleHeight(props.preferredHeight)
- setFoldState('HALF')
- }
- }
-
function toggleFold() {
if (props.searchStatus === 'SEARCHING') {
return
}
if (foldState !== 'COLLAPSE') {
- fold()
+ setFoldState('COLLAPSE')
} else if (props.searchResult) {
- unfold()
+ setFoldState('HALF')
} else {
props.searchText({ id: props.dictID })
}
}
}
-
-function DictRenderError() {
- return (
- <p style={{ textAlign: 'center' }}>
- Render error. Please{' '}
- <a
- href="https://github.com/crimx/ext-saladict/issues"
- target="_blank"
- rel="nofollow onopener noreferrer"
- >
- report issue
- </a>
- .
- </p>
- )
-}
diff --git a/src/content/components/DictItem/DictItemBody.tsx b/src/content/components/DictItem/DictItemBody.tsx
new file mode 100644
index 000000000..1d7cbc9cf
--- /dev/null
+++ b/src/content/components/DictItem/DictItemBody.tsx
@@ -0,0 +1,69 @@
+import React, { ComponentType, FC, useMemo, Suspense } from 'react'
+import root from 'react-shadow'
+import { Word } from '@/_helpers/record-manager'
+import { DictID } from '@/app-config'
+import { ViewPorps } from '@/components/dictionaries/helpers'
+import { ErrorBoundary } from '@/components/ErrorBoundary'
+
+export interface DictItemBodyProps {
+ dictID: DictID
+
+ searchStatus: 'IDLE' | 'SEARCHING' | 'FINISH'
+ searchResult?: object | null
+
+ searchText: (arg?: {
+ id?: DictID
+ word?: Word
+ payload?: { [index: string]: any }
+ }) => any
+}
+
+export const DictItemBody: FC<DictItemBodyProps> = props => {
+ const Dict = useMemo(
+ () =>
+ React.lazy<ComponentType<ViewPorps<any>>>(() =>
+ import(
+ /* webpackInclude: /View\.tsx$/ */
+ /* webpackChunkName: "dicts/[request]" */
+ /* webpackMode: "lazy" */
+ /* webpackPrefetch: true */
+ /* webpackPreload: true */
+ `@/components/dictionaries/${props.dictID}/View.tsx`
+ )
+ ),
+ [props.dictID]
+ )
+
+ return (
+ <ErrorBoundary error={DictRenderError}>
+ <Suspense fallback={null}>
+ {props.searchStatus === 'FINISH' && props.searchResult && (
+ <root.div>
+ <style>
+ {require('@/components/dictionaries/' +
+ props.dictID +
+ '/_style.shadow.scss').toString()}
+ </style>
+ <Dict result={props.searchResult} searchText={props.searchText} />
+ </root.div>
+ )}
+ </Suspense>
+ </ErrorBoundary>
+ )
+}
+
+function DictRenderError() {
+ return (
+ <p style={{ textAlign: 'center' }}>
+ Render error. Please{' '}
+ <a
+ href="https://github.com/crimx/ext-saladict/issues"
+ target="_blank"
+ rel="nofollow onopener noreferrer"
+ >
+ report issue
+ </a>
+ .
+ </p>
+ )
+}
diff --git a/yarn.lock b/yarn.lock
index 421e249a2..72e568b0e 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -10626,6 +10626,11 @@ react-resize-detector@^4.0.5:
raf-schd "^4.0.0"
resize-observer-polyfill "^1.5.1"
+react-resize-reporter@^0.1.0:
+ version "0.1.0"
+ resolved "https://registry.yarnpkg.com/react-resize-reporter/-/react-resize-reporter-0.1.0.tgz#2dd078f2610f7a7e9f1e549d757bcfbeaf6d064a"
+ integrity sha512-M02uIxklkXIyIZ27AMXC57Bs6Qdvu5VH2skL17hEutTyMtuRnN3n0ASy/r9fYwqG1ebMlOgZ47OeHk3ZPcDtAA==
+
react-select@^2.2.0:
version "2.4.4"
resolved "https://registry.yarnpkg.com/react-select/-/react-select-2.4.4.tgz#ba72468ef1060c7d46fbb862b0748f96491f1f73"
|
refactor
|
use react-resize-reporter
|
bb1ed052fbcdf73fd44944be430b1f3708db30b6
|
2018-02-25 08:53:24
|
greenkeeper[bot]
|
chore(package): update webpack to version 4.0.0
| false
|
diff --git a/package.json b/package.json
index 05e9bb264..992129513 100644
--- a/package.json
+++ b/package.json
@@ -111,7 +111,7 @@
"vue-loader": "^14.0.0",
"vue-style-loader": "^4.0.0",
"vue-template-compiler": "^2.5.13",
- "webpack": "3.11.0",
+ "webpack": "4.0.0",
"webpack-dev-server": "2.11.1"
},
"jest": {
|
chore
|
update webpack to version 4.0.0
|
0c0cd204c0c566d70c8278eccb302ef4f71c0b0e
|
2018-07-26 09:50:51
|
CRIMX
|
fix(dicts): encode url
| false
|
diff --git a/src/components/dictionaries/bing/engine.ts b/src/components/dictionaries/bing/engine.ts
index 89a15aae3..b4381b4a2 100644
--- a/src/components/dictionaries/bing/engine.ts
+++ b/src/components/dictionaries/bing/engine.ts
@@ -68,7 +68,7 @@ export default function search (
): Promise<DictSearchResult<BingResult>> {
const bingConfig = config.dicts.all.bing
- return fetchDirtyDOM(DICT_LINK + text)
+ return fetchDirtyDOM(DICT_LINK + encodeURIComponent(text))
.then(doc => {
if (doc.querySelector('.client_def_hd_hd')) {
return handleLexResult(doc, bingConfig.options)
diff --git a/src/components/dictionaries/cobuild/engine.ts b/src/components/dictionaries/cobuild/engine.ts
index 93bb20fc8..2f24756c5 100644
--- a/src/components/dictionaries/cobuild/engine.ts
+++ b/src/components/dictionaries/cobuild/engine.ts
@@ -22,6 +22,7 @@ export default function search (
text: string,
config: AppConfig
): Promise<COBUILDSearchResult> {
+ text = encodeURIComponent(text)
return fetchDirtyDOM('https://www.iciba.com/' + text)
.then(doc => handleDOM(doc, config.dicts.all.cobuild.options))
.catch(() => {
diff --git a/src/components/dictionaries/etymonline/engine.ts b/src/components/dictionaries/etymonline/engine.ts
index 5f79c0a07..6186e2ce1 100644
--- a/src/components/dictionaries/etymonline/engine.ts
+++ b/src/components/dictionaries/etymonline/engine.ts
@@ -20,6 +20,7 @@ export default function search (
config: AppConfig,
): Promise<EtymonlineSearchResult> {
const options = config.dicts.all.etymonline.options
+ text = encodeURIComponent(text)
// http to bypass the referer checking
return fetchDirtyDOM('http://www.etymonline.com/search?q=' + text)
diff --git a/src/components/dictionaries/eudic/engine.ts b/src/components/dictionaries/eudic/engine.ts
index 360aa6326..a6fddee37 100644
--- a/src/components/dictionaries/eudic/engine.ts
+++ b/src/components/dictionaries/eudic/engine.ts
@@ -18,7 +18,7 @@ export default function search (
text: string,
config: AppConfig,
): Promise<EudicSearchResult> {
- text = text.split(/\s+/).slice(0, 2).join(' ')
+ text = encodeURIComponent(text.split(/\s+/).slice(0, 2).join(' '))
const options = config.dicts.all.eudic.options
return fetchDirtyDOM('https://dict.eudic.net/dicts/en/' + text)
diff --git a/src/components/dictionaries/google/engine.ts b/src/components/dictionaries/google/engine.ts
index 0a9d6c9e4..d9f2b7f24 100644
--- a/src/components/dictionaries/google/engine.ts
+++ b/src/components/dictionaries/google/engine.ts
@@ -42,7 +42,7 @@ function fetchWithToken (base: string, sl: string, tl: string, text: string): Pr
if (tkk) {
const tk = getTK(text, Number(tkk[2]), (Number(tkk[0]) + Number(tkk[1])))
if (tk) {
- return fetch(`${base}/translate_a/single?client=t&sl=${sl}&tl=${tl}&q=${text}&tk=${tk}&hl=en&dt=at&dt=bd&dt=ex&dt=ld&dt=md&dt=qca&dt=rw&dt=rm&dt=ss&dt=t&ie=UTF-8&oe=UTF-8&otf=1&ssel=0&tsel=0&kc=5`)
+ return fetch(`${base}/translate_a/single?client=t&sl=${sl}&tl=${tl}&q=${encodeURIComponent(text)}&tk=${tk}&hl=en&dt=at&dt=bd&dt=ex&dt=ld&dt=md&dt=qca&dt=rw&dt=rm&dt=ss&dt=t&ie=UTF-8&oe=UTF-8&otf=1&ssel=0&tsel=0&kc=5`)
}
}
return handleNoResult()
@@ -51,7 +51,7 @@ function fetchWithToken (base: string, sl: string, tl: string, text: string): Pr
}
function fetchWithoutToken (sl: string, tl: string, text: string): Promise<string> {
- return fetch(`https://translate.googleapis.com/translate_a/single?client=gtx&sl=${sl}&tl=${tl}&dt=t&q=${text}`)
+ return fetch(`https://translate.googleapis.com/translate_a/single?client=gtx&sl=${sl}&tl=${tl}&dt=t&q=${encodeURIComponent(text)}`)
.then(r => r.text())
}
diff --git a/src/components/dictionaries/googledict/engine.ts b/src/components/dictionaries/googledict/engine.ts
index 11a3e489d..4766776db 100644
--- a/src/components/dictionaries/googledict/engine.ts
+++ b/src/components/dictionaries/googledict/engine.ts
@@ -15,7 +15,7 @@ export default function search (
config: AppConfig
): Promise<GoogleDictSearchResult> {
const isen = config.dicts.all.googledict.options.enresult ? 'hl=en&gl=en&' : ''
- return fetch(`https://www.google.com/search?${isen}q=define+` + text.replace(/\s+/g, '+'))
+ return fetch(`https://www.google.com/search?${isen}q=define+` + encodeURIComponent(text.replace(/\s+/g, '+')))
.then(r => r.text())
.then(handleDOM)
}
diff --git a/src/components/dictionaries/guoyu/engine.ts b/src/components/dictionaries/guoyu/engine.ts
index dd4ef115f..51857f6ff 100644
--- a/src/components/dictionaries/guoyu/engine.ts
+++ b/src/components/dictionaries/guoyu/engine.ts
@@ -40,7 +40,7 @@ export default function search (
text: string,
config: AppConfig
): Promise<DictSearchResult<GuoYuResult>> {
- return moedictSearch<GuoYuResult>('a', text, config)
+ return moedictSearch<GuoYuResult>('a', encodeURIComponent(text), config)
}
export function moedictSearch<R extends GuoYuResult> (
diff --git a/src/components/dictionaries/liangan/engine.ts b/src/components/dictionaries/liangan/engine.ts
index 58eb2165a..60844ff83 100644
--- a/src/components/dictionaries/liangan/engine.ts
+++ b/src/components/dictionaries/liangan/engine.ts
@@ -8,7 +8,7 @@ export default function search (
text: string,
config: AppConfig
): Promise<DictSearchResult<LiangAnResult>> {
- return moedictSearch<LiangAnResult>('c', text, config)
+ return moedictSearch<LiangAnResult>('c', encodeURIComponent(text), config)
.then(result => {
if (result.result.h) {
result.result.h.forEach(h => {
diff --git a/src/components/dictionaries/urban/engine.ts b/src/components/dictionaries/urban/engine.ts
index d366881df..472ddca1a 100644
--- a/src/components/dictionaries/urban/engine.ts
+++ b/src/components/dictionaries/urban/engine.ts
@@ -35,7 +35,7 @@ export default function search (
): Promise<UrbanSearchResult> {
const options = config.dicts.all.urban.options
- return fetchDirtyDOM('http://www.urbandictionary.com/define.php?term=' + text)
+ return fetchDirtyDOM('http://www.urbandictionary.com/define.php?term=' + encodeURIComponent(text))
.then(doc => handleDOM(doc, options))
}
diff --git a/src/components/dictionaries/vocabulary/engine.ts b/src/components/dictionaries/vocabulary/engine.ts
index 0971ba24c..e4cfa6c3b 100644
--- a/src/components/dictionaries/vocabulary/engine.ts
+++ b/src/components/dictionaries/vocabulary/engine.ts
@@ -14,7 +14,7 @@ export default function search (
text: string,
config: AppConfig,
): Promise<VocabularySearchResult> {
- return fetchDirtyDOM('https://www.vocabulary.com/dictionary/' + text)
+ return fetchDirtyDOM('https://www.vocabulary.com/dictionary/' + encodeURIComponent(text))
.then(handleDOM)
}
diff --git a/src/components/dictionaries/youdao/engine.ts b/src/components/dictionaries/youdao/engine.ts
index faaa049d2..4d2bcdbbb 100644
--- a/src/components/dictionaries/youdao/engine.ts
+++ b/src/components/dictionaries/youdao/engine.ts
@@ -37,7 +37,7 @@ export default function search (
): Promise<YoudaoSearchResult> {
const options = config.dicts.all.youdao.options
- return fetchDirtyDOM('http://www.youdao.com/w/' + text)
+ return fetchDirtyDOM('http://www.youdao.com/w/' + encodeURIComponent(text))
.then(doc => checkResult(doc, options))
}
diff --git a/src/components/dictionaries/zdic/engine.ts b/src/components/dictionaries/zdic/engine.ts
index 182a1d4ff..db03ef862 100644
--- a/src/components/dictionaries/zdic/engine.ts
+++ b/src/components/dictionaries/zdic/engine.ts
@@ -23,7 +23,7 @@ export default function search (
text: string,
config: AppConfig,
): Promise<ZdicSearchResult> {
- return fetchDirtyDOM('http://www.zdic.net/search/?c=3&q=' + text)
+ return fetchDirtyDOM('http://www.zdic.net/search/?c=3&q=' + encodeURIComponent(text))
.then(deobfuscate)
.then(handleDOM)
}
|
fix
|
encode url
|
6aa07b99308814ea2152b26c7e889dccf17e8d24
|
2020-04-18 18:55:09
|
crimx
|
refactor(options): use ref on modal form
| false
|
diff --git a/src/options/components/Entries/Notebook/WebdavModal.tsx b/src/options/components/Entries/Notebook/WebdavModal.tsx
index a57e3c104..5d21a0b3c 100644
--- a/src/options/components/Entries/Notebook/WebdavModal.tsx
+++ b/src/options/components/Entries/Notebook/WebdavModal.tsx
@@ -1,5 +1,5 @@
/* eslint-disable no-throw-literal */
-import React, { FC, useState } from 'react'
+import React, { FC, useState, useRef } from 'react'
import {
Form,
Input,
@@ -8,6 +8,8 @@ import {
message as antdMsg,
notification
} from 'antd'
+import { FormInstance } from 'antd/lib/form'
+import { ExclamationCircleOutlined } from '@ant-design/icons'
import { Service, SyncConfig } from '@/background/sync-manager/services/webdav'
import { removeSyncConfig } from '@/background/sync-manager/helpers'
import { message } from '@/_helpers/browser-api'
@@ -25,16 +27,7 @@ type ServiceResponse = undefined | { error: string }
export const WebdavModal: FC<WebdavModalProps> = props => {
const { t } = useTranslate(['options', 'common'])
const [serviceChecking, setServiceChecking] = useState(false)
- const [form] = Form.useForm()
-
- // useEffect(() => {
- // if (props.show) {
- // setTimeout(() => {
- // form.setFieldsValue(props.syncConfig || { duration: 15 })
- // }, 0)
- // setServiceChecking(false)
- // }
- // }, [props.show])
+ const formRef = useRef<FormInstance>(null)
return (
<Modal
@@ -62,7 +55,7 @@ export const WebdavModal: FC<WebdavModalProps> = props => {
]}
>
<Form
- form={form}
+ ref={formRef}
initialValues={props.syncConfig || { duration: 15 }}
labelCol={{ span: 5 }}
wrapperCol={{ span: 18 }}
@@ -83,7 +76,7 @@ export const WebdavModal: FC<WebdavModalProps> = props => {
label={t('syncService.webdav.url')}
hasFeedback
rules={[
- { type: 'url', message: t('syncService.error_url'), required: true }
+ { type: 'url', message: t('form.url_error'), required: true }
]}
>
<Input />
@@ -98,7 +91,9 @@ export const WebdavModal: FC<WebdavModalProps> = props => {
name="duration"
label={t('syncService.webdav.duration')}
extra={t('syncService.webdav.duration_help')}
- rules={[{ type: 'number', required: true }]}
+ rules={[
+ { type: 'number', message: t('form.number_error'), required: true }
+ ]}
>
<InputNumberGroup suffix={t('common:unit.mins')} />
</Form.Item>
@@ -107,12 +102,20 @@ export const WebdavModal: FC<WebdavModalProps> = props => {
)
function submitForm() {
- form.submit()
+ if (formRef.current) {
+ formRef.current.submit()
+ }
}
function closeModal() {
- if (!form.isFieldsTouched() || confirm(t('syncService.close_confirm'))) {
- form.resetFields()
+ if (formRef.current && formRef.current.isFieldsTouched()) {
+ Modal.confirm({
+ title: t('syncService.close_confirm'),
+ icon: <ExclamationCircleOutlined />,
+ okType: 'danger',
+ onOk: props.onClose
+ })
+ } else {
props.onClose()
}
}
@@ -123,16 +126,26 @@ export const WebdavModal: FC<WebdavModalProps> = props => {
onOk: () =>
tryTo(async () => {
await removeSyncConfig(Service.id)
- form.resetFields()
props.onClose()
})
})
}
async function saveService() {
+ if (!formRef.current) {
+ if (process.env.DEBUG) {
+ console.error(new Error('Missing form ref when saving service'))
+ }
+ notification.error({
+ message: 'Error',
+ description: t('syncService.webdav.err_internal')
+ })
+ return
+ }
+
setServiceChecking(true)
- const values = form.getFieldsValue()
+ const values = formRef.current.getFieldsValue()
if (values.url && !values.url.endsWith('/')) {
values.url += '/'
}
@@ -183,7 +196,6 @@ export const WebdavModal: FC<WebdavModalProps> = props => {
throw uploadRes?.error
}
- form.resetFields()
props.onClose()
} catch (error) {
const text = typeof error === 'string' ? error : String(error)
|
refactor
|
use ref on modal form
|
0cc1e03b47ca53a8a422a0dea7ff278fc40c3455
|
2018-02-02 08:26:49
|
greenkeeperio-bot
|
chore(package): update lockfile
| false
|
diff --git a/yarn.lock b/yarn.lock
index 838f12a4b..7f68d8034 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -6013,14 +6013,14 @@ postcss-load-plugins@^2.3.0:
cosmiconfig "^2.1.1"
object-assign "^4.1.0"
[email protected]:
- version "2.0.10"
- resolved "https://registry.npmjs.org/postcss-loader/-/postcss-loader-2.0.10.tgz#090db0540140bd56a7a7f717c41bc29aeef4c674"
[email protected]:
+ version "2.1.0"
+ resolved "https://registry.yarnpkg.com/postcss-loader/-/postcss-loader-2.1.0.tgz#038c2d6d59753fef4667827fd3ae03f5dc5e6a7a"
dependencies:
loader-utils "^1.1.0"
postcss "^6.0.0"
postcss-load-config "^1.2.0"
- schema-utils "^0.3.0"
+ schema-utils "^0.4.0"
postcss-merge-idents@^2.1.5:
version "2.1.7"
@@ -6960,7 +6960,7 @@ schema-utils@^0.3.0:
dependencies:
ajv "^5.0.0"
-schema-utils@^0.4.2, schema-utils@^0.4.3:
+schema-utils@^0.4.0, schema-utils@^0.4.2, schema-utils@^0.4.3:
version "0.4.3"
resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-0.4.3.tgz#e2a594d3395834d5e15da22b48be13517859458e"
dependencies:
@@ -8218,7 +8218,7 @@ wbuf@^1.1.0, wbuf@^1.7.2:
minimalistic-assert "^1.0.0"
web-ext-types@crimx/web-ext-types:
- version "1.1.7"
+ version "1.1.6"
resolved "https://codeload.github.com/crimx/web-ext-types/tar.gz/f43910e7cb71d6d5dca3616027c8024887af9b6b"
webextension-polyfill@^0.2.1:
|
chore
|
update lockfile
|
0f58d63ca3b140e32e42148ad716952c76934d5c
|
2018-12-04 12:50:14
|
CRIMX
|
chore(webpack): remove unused
| false
|
diff --git a/config/webpack.config.dev.js b/config/webpack.config.dev.js
index 8a2609176..813355a51 100644
--- a/config/webpack.config.dev.js
+++ b/config/webpack.config.dev.js
@@ -2,7 +2,6 @@
const fs = require('fs')
const path = require('path')
-const autoprefixer = require('autoprefixer')
const webpack = require('webpack')
const HtmlWebpackPlugin = require('html-webpack-plugin')
const CaseSensitivePathsPlugin = require('case-sensitive-paths-webpack-plugin')
diff --git a/config/webpack.config.prod.js b/config/webpack.config.prod.js
index 9f596fdfc..8b23fba73 100644
--- a/config/webpack.config.prod.js
+++ b/config/webpack.config.prod.js
@@ -2,7 +2,6 @@
const fs = require('fs')
const path = require('path')
-const autoprefixer = require('autoprefixer')
const webpack = require('webpack')
const HtmlWebpackPlugin = require('html-webpack-plugin')
const ExtractTextPlugin = require('extract-text-webpack-plugin')
|
chore
|
remove unused
|
685ded1ee09736d9da453cd13d4cf855727e9698
|
2018-05-30 09:14:19
|
CRIMX
|
fix(manifest): fix manifest
| false
|
diff --git a/src/manifest/chrome.manifest.json b/src/manifest/chrome.manifest.json
index c1a026443..8f7c5c28f 100644
--- a/src/manifest/chrome.manifest.json
+++ b/src/manifest/chrome.manifest.json
@@ -1,3 +1,12 @@
{
+ "background": {
+ "scripts": [
+ "static/browser-polyfill.min.js",
+ "background.js"
+ ],
+ "persistent": true
+ },
+ "options_page": "options.html",
+ "update_url": "https://clients2.google.com/service/update2/crx",
"minimum_chrome_version": "55"
}
diff --git a/src/manifest/common.manifest.json b/src/manifest/common.manifest.json
index b17f3709e..a23bb84d1 100644
--- a/src/manifest/common.manifest.json
+++ b/src/manifest/common.manifest.json
@@ -7,8 +7,6 @@
"short_name": "__MSG_extension_short_name__",
"description": "__MSG_extension_description__",
- "update_url": "https://clients2.google.com/service/update2/crx",
-
"default_locale": "zh_CN",
"icons": {
@@ -17,16 +15,6 @@
"128": "static/icon-128.png"
},
- "options_page": "options.html",
-
- "background": {
- "scripts": [
- "static/browser-polyfill.min.js",
- "background.js"
- ],
- "persistent": true
- },
-
"content_scripts": [
{
"js": [
diff --git a/src/manifest/firefox.manifest.json b/src/manifest/firefox.manifest.json
index 13708af46..2f1c505a7 100644
--- a/src/manifest/firefox.manifest.json
+++ b/src/manifest/firefox.manifest.json
@@ -1,4 +1,15 @@
{
+ "background": {
+ "scripts": [
+ "static/browser-polyfill.min.js",
+ "background.js"
+ ]
+ },
+ "options_ui": {
+ "page": "options.html",
+ "browser_style": false,
+ "open_in_tab": true
+ },
"applications": {
"gecko": {
"id": "[email protected]",
|
fix
|
fix manifest
|
db088c21860326c79f226b3c166f633b94f9c9d5
|
2019-12-26 16:28:42
|
crimx
|
refactor(content): update word editor styles
| false
|
diff --git a/src/content/components/WordEditor/WordEditorPanel.scss b/src/content/components/WordEditor/WordEditorPanel.scss
index b35a92772..89712b374 100644
--- a/src/content/components/WordEditor/WordEditorPanel.scss
+++ b/src/content/components/WordEditor/WordEditorPanel.scss
@@ -10,7 +10,6 @@
bottom: 0;
margin: auto;
display: flex;
- justify-content: center;
align-items: center;
text-align: initial;
background: rgba(0, 0, 0, 0.4);
@@ -32,7 +31,7 @@
.wordEditorPanel-Header {
display: flex;
- border-bottom: 1px solid #666;
+ border-bottom: 1px solid #ccc;
}
.wordEditorPanel-Title {
@@ -70,7 +69,7 @@
.wordEditorPanel-Footer {
padding: 15px;
text-align: right;
- border-top: 1px solid #666;
+ border-top: 1px solid #ccc;
}
%wordEditorPanel-Btn {
@@ -147,6 +146,11 @@
}
.darkMode {
+ .wordEditorPanel-Header,
+ .wordEditorPanel-Footer {
+ border-color: #8b8b8b;
+ }
+
.wordEditorPanel-Btn {
@extend %wordEditorPanel-Btn;
margin-right: 10px;
diff --git a/src/content/components/WordEditor/WordEditorPanel.stories.tsx b/src/content/components/WordEditor/WordEditorPanel.stories.tsx
index 93782d0d4..6a1ce5bf6 100644
--- a/src/content/components/WordEditor/WordEditorPanel.stories.tsx
+++ b/src/content/components/WordEditor/WordEditorPanel.stories.tsx
@@ -32,6 +32,7 @@ storiesOf('Content Scripts|WordEditor', module)
return (
<div
+ className={darkMode ? 'darkMode' : ''}
style={{
display: 'flex',
justifyContent: 'center',
@@ -39,7 +40,7 @@ storiesOf('Content Scripts|WordEditor', module)
}}
>
<WordEditorPanel
- width={number('Panel Width', 450)}
+ panelX={number('Panel X', 450 + 100)}
colors={colors}
btns={
boolean('With Buttons', true)
diff --git a/src/content/components/WordEditor/WordEditorPanel.tsx b/src/content/components/WordEditor/WordEditorPanel.tsx
index 8a70cbcba..fc7c08623 100644
--- a/src/content/components/WordEditor/WordEditorPanel.tsx
+++ b/src/content/components/WordEditor/WordEditorPanel.tsx
@@ -1,7 +1,7 @@
import React, { FC } from 'react'
export interface WordEditorPanelProps {
- width: number
+ panelX: number
colors: React.CSSProperties
title: React.ReactNode
btns?: Array<{
@@ -15,7 +15,7 @@ export interface WordEditorPanelProps {
export const WordEditorPanel: FC<WordEditorPanelProps> = props => {
return (
<div className="wordEditorPanel-Container">
- <div style={{ width: props.width }}>
+ <div style={{ marginLeft: props.panelX }}>
<div className="wordEditorPanel" style={props.colors}>
<header className="wordEditorPanel-Header">
<h1 className="wordEditorPanel-Title">{props.title}</h1>
|
refactor
|
update word editor styles
|
87ebd426c35a321d905028bf6ded0fc9304027bf
|
2018-04-28 12:14:48
|
CRIMX
|
ci: change node version
| false
|
diff --git a/.travis.yml b/.travis.yml
index 5060def93..3fef72d6c 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,6 +1,6 @@
language: node_js
node_js:
-- stable
-before_install: yarn global add greenkeeper-lockfile@1
-before_script: greenkeeper-lockfile-update
-after_script: greenkeeper-lockfile-upload
+- "9"
+# before_install: yarn global add greenkeeper-lockfile@1
+# before_script: greenkeeper-lockfile-update
+# after_script: greenkeeper-lockfile-upload
|
ci
|
change node version
|
c4439fd3d3601ed51238851c9a023db2a5192fc2
|
2020-05-26 02:31:02
|
crimx
|
style(options): remove legacy code
| false
|
diff --git a/src/options/App.tsx b/src/options/App.tsx
deleted file mode 100644
index b741e36cf..000000000
--- a/src/options/App.tsx
+++ /dev/null
@@ -1,153 +0,0 @@
-import React from 'react'
-import { AppConfig } from '@/app-config'
-import { Profile, ProfileIDList } from '@/app-config/profiles'
-import { withTranslation, WithTranslation } from 'react-i18next'
-import { Layout, Menu, Icon } from 'antd'
-import HeadInfo from './components/HeadInfo'
-import { getProfileName } from '@/_helpers/profile-manager'
-import { reportGA } from '@/_helpers/analytics'
-
-const { Header, Content, Sider } = Layout
-
-const _optRequire = require.context(
- './components/options/',
- true,
- /index\.tsx$/
-)
-
-const menuselected =
- new URL(document.URL).searchParams.get('menuselected') || 'General'
-
-export interface OptionsMainProps {
- config: AppConfig
- profile: Profile
- profileIDList: ProfileIDList
- rawProfileName: string
-}
-
-interface OptionsMainState {
- selectedKey: string
-}
-
-export class OptionsMain extends React.Component<
- OptionsMainProps & WithTranslation,
- OptionsMainState
-> {
- state: OptionsMainState = {
- selectedKey: menuselected
- }
-
- onNavSelect = ({ key }: { key: string }) => {
- this.setState({ selectedKey: key })
- this.setTitle(key)
- const { protocol, host, pathname } = window.location
- const newurl = `${protocol}//${host}${pathname}?menuselected=${key}`
- window.history.pushState({ key }, '', newurl)
- if (this.props.config.analytics) {
- reportGA(`/options/${key}`)
- }
- }
-
- setTitle = (key: string) => {
- const { t } = this.props
- document.title = `${t('title')} - ${t('nav.' + key)}`
- }
-
- componentDidMount() {
- this.setTitle(this.state.selectedKey)
-
- if (this.props.config.analytics) {
- reportGA(`/options/${this.state.selectedKey}`)
- }
-
- window.addEventListener('popstate', e => {
- this.setState({ selectedKey: e.state.key || 'General' })
- })
- }
-
- render() {
- const { t, i18n, config, profile, rawProfileName } = this.props
-
- return (
- <Layout
- className="xmain-container"
- style={{ maxWidth: 1400, margin: '0 auto' }}
- >
- <Header className="options-header">
- <h1 style={{ color: '#fff' }}>{t('title')}</h1>
- <span style={{ color: '#fff' }}>
- 「 {getProfileName(rawProfileName, t)} 」
- </span>
- <HeadInfo />
- </Header>
- <Layout>
- <Sider width={180} style={{ background: '#fff' }}>
- <Menu
- mode="inline"
- selectedKeys={[this.state.selectedKey]}
- style={{ height: '100%', borderRight: 0 }}
- onSelect={this.onNavSelect}
- >
- <Menu.Item key="General">
- <Icon type="setting" /> {t('nav.General')}
- </Menu.Item>
- <Menu.Item key="Notebook">
- <Icon type="tags" /> {t('nav.Notebook')}
- </Menu.Item>
- <Menu.Item key="Profiles">
- <Icon type="dashboard" /> {t('nav.Profiles')}
- </Menu.Item>
- <Menu.Item key="DictPanel">
- <Icon type="profile" /> {t('nav.DictPanel')}
- </Menu.Item>
- <Menu.Item key="SearchModes">
- <Icon type="select" /> {t('nav.SearchModes')}
- </Menu.Item>
- <Menu.Item key="Dictionaries">
- <Icon type="book" /> {t('nav.Dictionaries')}
- </Menu.Item>
- <Menu.Item key="PDF">
- <Icon type="file-pdf" /> {t('nav.PDF')}
- </Menu.Item>
- <Menu.Item key="ContextMenus">
- <Icon type="database" /> {t('nav.ContextMenus')}
- </Menu.Item>
- <Menu.Item key="Popup">
- <Icon type="layout" /> {t('nav.Popup')}
- </Menu.Item>
- <Menu.Item key="QuickSearch">
- <Icon type="flag" /> {t('nav.QuickSearch')}
- </Menu.Item>
- <Menu.Item key="BlackWhiteList">
- <Icon type="exception" /> {t('nav.BlackWhiteList')}
- </Menu.Item>
- <Menu.Item key="ImportExport">
- <Icon type="swap" /> {t('nav.ImportExport')}
- </Menu.Item>
- <Menu.Item key="Privacy">
- <Icon type="lock" /> {t('nav.Privacy')}
- </Menu.Item>
- </Menu>
- </Sider>
- <Layout style={{ padding: '24px', minHeight: innerHeight - 64 }}>
- <Content
- data-option-content={this.state.selectedKey}
- style={{
- background: '#fff',
- padding: 24,
- margin: 0
- }}
- >
- {React.createElement(
- _optRequire(`./${this.state.selectedKey}/index.tsx`).default,
- { t, i18n, config, profile }
- )}
- </Content>
- </Layout>
- </Layout>
- </Layout>
- )
- }
-}
-
-export default withTranslation()(OptionsMain)
|
style
|
remove legacy code
|
dfdf3cf28ba68fd6107e6698114b330e407cb5e7
|
2020-05-03 12:35:22
|
crimx
|
refactor(dicts): let jikipedia match other chars by default
| false
|
diff --git a/src/components/dictionaries/jikipedia/config.ts b/src/components/dictionaries/jikipedia/config.ts
index 6c357b175..031521d20 100644
--- a/src/components/dictionaries/jikipedia/config.ts
+++ b/src/components/dictionaries/jikipedia/config.ts
@@ -14,7 +14,7 @@ export default (): UrbanConfig => ({
french: false,
spanish: false,
deutsch: false,
- others: false,
+ others: true,
matchAll: false
},
defaultUnfold: {
|
refactor
|
let jikipedia match other chars by default
|
31bc9c8d5e497f0d3f1583e1d5ff5828cb70c509
|
2020-03-09 14:49:24
|
crimx
|
refactor(panel): update panel max height on window resize
| false
|
diff --git a/src/content/redux/init.ts b/src/content/redux/init.ts
index 65bc96afb..a49633830 100644
--- a/src/content/redux/init.ts
+++ b/src/content/redux/init.ts
@@ -21,6 +21,10 @@ export const init = (
dispatch: Dispatch<StoreAction>,
getState: () => StoreState
) => {
+ window.addEventListener('resize', () => {
+ dispatch({ type: 'WINDOW_RESIZE' })
+ })
+
addConfigListener(({ newConfig }) => {
if (newConfig.active !== getState().config.active) {
message.send({
@@ -234,10 +238,12 @@ async function summonedPanelInit(
try {
if (preload === 'selection') {
if (standalone === 'popup') {
- const tab = (await browser.tabs.query({
- active: true,
- currentWindow: true
- }))[0]
+ const tab = (
+ await browser.tabs.query({
+ active: true,
+ currentWindow: true
+ })
+ )[0]
if (tab && tab.id != null) {
word = await message.send<'PRELOAD_SELECTION'>(tab.id, {
type: 'PRELOAD_SELECTION'
diff --git a/src/content/redux/modules/action-catalog.ts b/src/content/redux/modules/action-catalog.ts
index 839722828..a985c5c83 100644
--- a/src/content/redux/modules/action-catalog.ts
+++ b/src/content/redux/modules/action-catalog.ts
@@ -21,6 +21,8 @@ export type ActionCatalog = CreateActionCatalog<{
payload: Message<'SELECTION'>['payload']
}
+ WINDOW_RESIZE: {}
+
/** Is App temporary disabled */
TEMP_DISABLED_STATE: {
payload: boolean
diff --git a/src/content/redux/modules/action-handlers/index.ts b/src/content/redux/modules/action-handlers/index.ts
index d650406ea..08c25acf1 100644
--- a/src/content/redux/modules/action-handlers/index.ts
+++ b/src/content/redux/modules/action-handlers/index.ts
@@ -70,6 +70,12 @@ export const actionHandlers: ActionHandlers<State, ActionCatalog> = {
NEW_SELECTION: newSelection,
+ WINDOW_RESIZE: state => ({
+ ...state,
+ panelMaxHeight:
+ (window.innerHeight * state.config.panelMaxHeightRatio) / 100
+ }),
+
TEMP_DISABLED_STATE: (state, { payload }) =>
payload
? {
|
refactor
|
update panel max height on window resize
|
83cadf3d89a903e6d84e89fb659287903bf6f509
|
2019-01-21 14:51:43
|
CRIMX
|
fix(options): update active profile name on init
| false
|
diff --git a/src/options/index.tsx b/src/options/index.tsx
index 7ffe8a5dd..9af7d5b94 100644
--- a/src/options/index.tsx
+++ b/src/options/index.tsx
@@ -72,7 +72,12 @@ export class Options extends React.Component<OptionsProps, OptionsState> {
Promise.all([getConfig(), getActiveProfile(), getProfileIDList()])
.then(([ config, profile, profileIDList ]) => {
- this.setState({ config, profile, profileIDList })
+ this.setState({
+ config,
+ profile,
+ profileIDList,
+ rawProfileName: this.getActiveProfileName(profile.id),
+ })
})
addConfigListener(({ newConfig }) => {
@@ -82,11 +87,10 @@ export class Options extends React.Component<OptionsProps, OptionsState> {
})
addActiveProfileListener(({ newProfile }) => {
- const activeProfileID = this.state.profileIDList.find(
- ({ id }) => id === newProfile.id
- )
- const rawProfileName = activeProfileID ? activeProfileID.name : ''
- this.setState({ profile: newProfile, rawProfileName })
+ this.setState({
+ profile: newProfile,
+ rawProfileName: this.getActiveProfileName(newProfile.id),
+ })
message.destroy()
message.success(i18n.t('msg_updated'))
})
@@ -98,6 +102,13 @@ export class Options extends React.Component<OptionsProps, OptionsState> {
})
}
+ getActiveProfileName = (activeID: string): string => {
+ const activeProfileID = this.state.profileIDList.find(
+ ({ id }) => id === activeID
+ )
+ return activeProfileID ? activeProfileID.name : ''
+ }
+
render () {
return (
<ProviderI18next i18n={i18n}>
|
fix
|
update active profile name on init
|
b241d8b90e198d696e1f92190726eb9de7880ed1
|
2019-01-22 22:34:10
|
CRIMX
|
fix(options): close modal
| false
|
diff --git a/src/options/components/options/Profiles/index.tsx b/src/options/components/options/Profiles/index.tsx
index da4db36bb..8af2b54c3 100644
--- a/src/options/components/options/Profiles/index.tsx
+++ b/src/options/components/options/Profiles/index.tsx
@@ -116,6 +116,7 @@ export class Profiles extends React.Component<ProfilesProps, ProfilesState> {
this.setState({
list: newList,
editingProfileID: null,
+ showEditNameModal: false,
})
if (newProfileID.id !== selected) {
// active config alert is handled by global
|
fix
|
close modal
|
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.