From 09f3b4c54ca6bdcf57b87e682d7e4f628b9abdc8 Mon Sep 17 00:00:00 2001 From: * <*> Date: Fri, 15 Sep 2023 16:05:13 +0800 Subject: [PATCH] Match-id-093c12d2a2ecaf8edf1894e8fa83ed3de5be7716 --- packages/inula-intl/babel.config.js | 2 +- packages/inula-intl/example/App.tsx | 2 +- packages/inula-intl/example/components/Example1.tsx | 2 +- packages/inula-intl/example/components/Example2.tsx | 2 +- packages/inula-intl/example/components/Example3.tsx | 2 +- packages/inula-intl/example/components/Example4.tsx | 2 +- packages/inula-intl/example/components/Example5.tsx | 2 +- packages/inula-intl/example/components/Example6.tsx | 2 +- packages/inula-intl/example/index.tsx | 2 +- packages/inula-intl/package.json | 8 ++++---- packages/inula-intl/rollup.config.js | 7 ++----- .../inula-intl/src/core/components/FormattedMessage.tsx | 2 +- packages/inula-intl/src/core/components/I18nProvider.tsx | 2 +- packages/inula-intl/src/core/components/InjectI18n.tsx | 2 +- packages/inula-intl/src/core/hook/useI18n.ts | 2 +- packages/inula-intl/src/utils/copyStaticProps.ts | 2 +- packages/inula-intl/tests/utils/copyStatics.test.ts | 2 +- packages/inula-intl/webpack.config.js | 2 +- 18 files changed, 22 insertions(+), 25 deletions(-) diff --git a/packages/inula-intl/babel.config.js b/packages/inula-intl/babel.config.js index 220238ab..fd1b09a9 100644 --- a/packages/inula-intl/babel.config.js +++ b/packages/inula-intl/babel.config.js @@ -19,7 +19,7 @@ module.exports = { "@babel/preset-react", { "runtime": "automatic", - "importSource": "@cloudsop/horizon" + "importSource": "inulajs" } ] ], diff --git a/packages/inula-intl/example/App.tsx b/packages/inula-intl/example/App.tsx index 74c4e2e7..63bd9f2d 100644 --- a/packages/inula-intl/example/App.tsx +++ b/packages/inula-intl/example/App.tsx @@ -2,7 +2,7 @@ * Copyright (c) Huawei Technologies Co., Ltd. 2023-2023. All rights reserved. */ -import Inula, { useState } from '@cloudsop/horizon'; +import Inula, { useState } from 'inulajs'; import { IntlProvider } from "../index"; import zh from "./locale/zh"; import en from "./locale/en"; diff --git a/packages/inula-intl/example/components/Example1.tsx b/packages/inula-intl/example/components/Example1.tsx index 494f61c2..3f6c3ec4 100644 --- a/packages/inula-intl/example/components/Example1.tsx +++ b/packages/inula-intl/example/components/Example1.tsx @@ -2,7 +2,7 @@ * Copyright (c) Huawei Technologies Co., Ltd. 2023-2023. All rights reserved. */ -import Inula from "@cloudsop/horizon"; +import Inula from "inulajs"; import { useIntl } from "../../index"; const Example1 = () => { diff --git a/packages/inula-intl/example/components/Example2.tsx b/packages/inula-intl/example/components/Example2.tsx index 729e3ec9..5cb97bee 100644 --- a/packages/inula-intl/example/components/Example2.tsx +++ b/packages/inula-intl/example/components/Example2.tsx @@ -1,7 +1,7 @@ /* * Copyright (c) Huawei Technologies Co., Ltd. 2023-2023. All rights reserved. */ -import Inula from "@cloudsop/horizon"; +import Inula from "inulajs"; import { FormattedMessage } from "../../index"; const Example2= () => { diff --git a/packages/inula-intl/example/components/Example3.tsx b/packages/inula-intl/example/components/Example3.tsx index c25cc318..e21c9185 100644 --- a/packages/inula-intl/example/components/Example3.tsx +++ b/packages/inula-intl/example/components/Example3.tsx @@ -2,7 +2,7 @@ * Copyright (c) Huawei Technologies Co., Ltd. 2023-2023. All rights reserved. */ -import Inula from '@cloudsop/horizon'; +import Inula from 'inulajs'; import { FormattedMessage } from "../../index"; const Example3 = (props) => { diff --git a/packages/inula-intl/example/components/Example4.tsx b/packages/inula-intl/example/components/Example4.tsx index 3eebdbac..29f4cec5 100644 --- a/packages/inula-intl/example/components/Example4.tsx +++ b/packages/inula-intl/example/components/Example4.tsx @@ -2,7 +2,7 @@ * Copyright (c) Huawei Technologies Co., Ltd. 2023-2023. All rights reserved. */ -import Inula from "@cloudsop/horizon"; +import Inula from "inulajs"; import { createIntl } from "../../index"; const Example4 = (props) => { diff --git a/packages/inula-intl/example/components/Example5.tsx b/packages/inula-intl/example/components/Example5.tsx index c36050d7..6499bf81 100644 --- a/packages/inula-intl/example/components/Example5.tsx +++ b/packages/inula-intl/example/components/Example5.tsx @@ -2,7 +2,7 @@ * Copyright (c) Huawei Technologies Co., Ltd. 2023-2023. All rights reserved. */ -import Inula, { Component } from '@cloudsop/horizon'; +import Inula, { Component } from 'inulajs'; import { injectIntl } from '../../index'; class Example5 extends Component { diff --git a/packages/inula-intl/example/components/Example6.tsx b/packages/inula-intl/example/components/Example6.tsx index 7aec1316..28f2ad9f 100644 --- a/packages/inula-intl/example/components/Example6.tsx +++ b/packages/inula-intl/example/components/Example6.tsx @@ -2,7 +2,7 @@ * Copyright (c) Huawei Technologies Co., Ltd. 2023-2023. All rights reserved. */ -import Inula from "@cloudsop/horizon"; +import Inula from "inulajs"; import { createIntl, createIntlCache, RawIntlProvider } from "../../index"; import Example6Child from "./Example6Child"; diff --git a/packages/inula-intl/example/index.tsx b/packages/inula-intl/example/index.tsx index 7a069d26..f1fb4c72 100644 --- a/packages/inula-intl/example/index.tsx +++ b/packages/inula-intl/example/index.tsx @@ -1,7 +1,7 @@ /* * Copyright (c) Huawei Technologies Co., Ltd. 2023-2023. All rights reserved. */ -import * as Inula from '@cloudsop/horizon'; +import * as Inula from 'inulajs'; import App from './App' function render() { diff --git a/packages/inula-intl/package.json b/packages/inula-intl/package.json index 3c42c4cc..ec5d0fc0 100644 --- a/packages/inula-intl/package.json +++ b/packages/inula-intl/package.json @@ -1,6 +1,6 @@ { - "name": "@cloudsop/horizon-intl", - "version": "1.0.22", + "name": "inula-intl", + "version": "0.0.1", "description": "", "main": "build/intl.umd.js", "type": "commonjs", @@ -13,7 +13,7 @@ }, "repository": { "type": "git", - "url": "https://szv-open.codehub.huawei.com/innersource/fenghuang/horizon/horizon-core.git" + "url": "" }, "files": [ "build", @@ -23,7 +23,7 @@ "author": "", "license": "ISC", "dependencies": { - "@cloudsop/horizon": "^0.0.58" + "inulajs": "^0.0.11" }, "devDependencies": { "@babel/core": "7.21.3", diff --git a/packages/inula-intl/rollup.config.js b/packages/inula-intl/rollup.config.js index 6414fd43..189e4ae0 100644 --- a/packages/inula-intl/rollup.config.js +++ b/packages/inula-intl/rollup.config.js @@ -20,11 +20,8 @@ export default { output: [ { file: path.resolve(output, 'intl.umd.js'), - name: 'HorizonI18n', + name: 'InulaI18n', format: 'umd', - globals:{ - '@cloudsop/horizon':'Horizon' - } }, ], plugins: [ @@ -46,7 +43,7 @@ export default { terser(), ], external:[ - '@cloudsop/horizon', + 'inulajs', 'react', 'react-dom' ] diff --git a/packages/inula-intl/src/core/components/FormattedMessage.tsx b/packages/inula-intl/src/core/components/FormattedMessage.tsx index c4131705..837498c0 100644 --- a/packages/inula-intl/src/core/components/FormattedMessage.tsx +++ b/packages/inula-intl/src/core/components/FormattedMessage.tsx @@ -1,7 +1,7 @@ /* * Copyright (c) Huawei Technologies Co., Ltd. 2023-2023. All rights reserved. */ -import Inula, { Children, Fragment } from '@cloudsop/horizon'; +import Inula, { Children, Fragment } from 'inulajs'; import { FormattedMessageProps } from '../../types/interfaces'; import useI18n from '../hook/useI18n'; diff --git a/packages/inula-intl/src/core/components/I18nProvider.tsx b/packages/inula-intl/src/core/components/I18nProvider.tsx index 85defd8e..35730bf2 100644 --- a/packages/inula-intl/src/core/components/I18nProvider.tsx +++ b/packages/inula-intl/src/core/components/I18nProvider.tsx @@ -1,7 +1,7 @@ /* * Copyright (c) Huawei Technologies Co., Ltd. 2023-2023. All rights reserved. */ -import Inula, { useRef, useState, useEffect, useMemo, Component } from '@cloudsop/horizon'; +import Inula, { useRef, useState, useEffect, useMemo, Component } from 'inulajs'; import utils from '../../utils/utils'; import { InjectProvider } from './InjectI18n'; import I18n, { createI18nInstance } from '../I18n'; diff --git a/packages/inula-intl/src/core/components/InjectI18n.tsx b/packages/inula-intl/src/core/components/InjectI18n.tsx index 8233f355..859a8930 100644 --- a/packages/inula-intl/src/core/components/InjectI18n.tsx +++ b/packages/inula-intl/src/core/components/InjectI18n.tsx @@ -1,7 +1,7 @@ /* * Copyright (c) Huawei Technologies Co., Ltd. 2023-2023. All rights reserved. */ -import Inula , { createContext, forwardRef } from '@cloudsop/horizon'; +import Inula , { createContext, forwardRef } from 'inulajs'; import { isVariantI18n } from '../../utils/utils'; import copyStaticProps from '../../utils/copyStaticProps'; import { InjectOptions } from '../../types/interfaces'; diff --git a/packages/inula-intl/src/core/hook/useI18n.ts b/packages/inula-intl/src/core/hook/useI18n.ts index f83713d2..48615a86 100644 --- a/packages/inula-intl/src/core/hook/useI18n.ts +++ b/packages/inula-intl/src/core/hook/useI18n.ts @@ -1,7 +1,7 @@ /* * Copyright (c) Huawei Technologies Co., Ltd. 2023-2023. All rights reserved. */ -import Inula, { useContext } from '@cloudsop/horizon'; +import Inula, { useContext } from 'inulajs'; import utils from '../../utils/utils'; import { I18nContext } from '../components/InjectI18n'; import I18n from '../I18n'; diff --git a/packages/inula-intl/src/utils/copyStaticProps.ts b/packages/inula-intl/src/utils/copyStaticProps.ts index d02575d4..b7192f2a 100644 --- a/packages/inula-intl/src/utils/copyStaticProps.ts +++ b/packages/inula-intl/src/utils/copyStaticProps.ts @@ -1,7 +1,7 @@ /* * Copyright (c) Huawei Technologies Co., Ltd. 2023-2023. All rights reserved. */ -import { isMemo, ForwardRef } from '@cloudsop/horizon'; +import { isMemo, ForwardRef } from 'inulajs'; import { INULA_FORWARD_REF_STATICS, INULA_MEMO_STATICS, diff --git a/packages/inula-intl/tests/utils/copyStatics.test.ts b/packages/inula-intl/tests/utils/copyStatics.test.ts index 9002ad8b..9c64e0f7 100644 --- a/packages/inula-intl/tests/utils/copyStatics.test.ts +++ b/packages/inula-intl/tests/utils/copyStatics.test.ts @@ -3,7 +3,7 @@ */ import copyStaticProps from '../../src/utils/copyStaticProps'; -describe('hoistNonReactStatics', () => { +describe('copyStaticProps', () => { test('should hoist static properties from sourceComponent to targetComponent', () => { class SourceComponent { static staticProp = 'sourceProp'; diff --git a/packages/inula-intl/webpack.config.js b/packages/inula-intl/webpack.config.js index 765f1345..4d45992d 100644 --- a/packages/inula-intl/webpack.config.js +++ b/packages/inula-intl/webpack.config.js @@ -21,7 +21,7 @@ module.exports = { '@babel/preset-react', { 'runtime': 'automatic', // 新增 - 'importSource': '@cloudsop/horizon' // 新增 + 'importSource': 'inulajs' // 新增 } ], '@babel/preset-typescript'],