fix: 修复构建错误 (opentiny#25)

faylai · Feb 28, 2023 · ff486e3 · ff486e3
1 parent e9dae3d
commit ff486e3
Show file tree

Hide file tree

Showing 9 changed files with 26 additions and 28 deletions.
diff --git a/build/build-icon.js b/build/build-icon.js
@@ -32,7 +32,7 @@ const inputOptions = {
     // 如果打包文件中包含 jsx 语法， commonjs 必须放置在 babel 配置下面，否则会报错 PLUGIN_ERROR
     commonjs()
   ],
-  external: (deps) => /^@huawei[\\/]tiny-vue-common/.test(deps)
+  external: (deps) => /^@opentiny[\\/]vue-common/.test(deps)
 }
 
 const outputOptions = {
@@ -49,7 +49,7 @@ const build = (components) => {
     if (component.path === 'index.js') {
       inputs.external = (deps) => !deps.includes('index.js')
     } else {
-      inputs.external = (deps) => /^@huawei[\\/]tiny-vue-common/.test(deps)
+      inputs.external = (deps) => /^@opentiny[\\/]vue-common/.test(deps)
     }
 
     rollup

diff --git a/build/build-version.js b/build/build-version.js
@@ -16,7 +16,7 @@ const TAG = process.argv[3] === 'false' ? '' : process.argv[3]
 const packages = path.join(ROOT_PATH, 'packages')
 const pkgJsonFileName = 'package.json'
 const { logGreen } = require('./utils')
-const tinyVueReg = /@huawei\//
+const tinyVueReg = /@opentiny\//
 
 const targetVersion = process.argv[2] || JSON.parse(fs.readFileSync(path.join(ROOT_PATH, pkgJsonFileName)).toString()).version
 

diff --git a/build/config.js b/build/config.js
@@ -63,8 +63,7 @@ components.forEach((item) => {
 
 exports.aliasList = aliasList
 
-exports.external = (deps) =>
-  external.includes(deps) || /^@huawei[\\/](tiny-vue-renderless|tiny-vue-theme|tiny-vue-common|tiny-vue-icon)|echarts|cropperjs|quill/.test(deps)
+exports.external = (deps) => external.includes(deps) || /^@opentiny[\\/](vue-renderless|vue-theme|vue-common|vue-icon)|echarts|cropperjs|quill/.test(deps)
 
 exports.globals = globals
 

diff --git a/build/module-utils.js b/build/module-utils.js
@@ -197,7 +197,7 @@ const getSortModules = ({ filterIntercept, isSort = true }) => {
         component.parentDir = componentName
         // libPath: 'packages/todo/dist/pc.js' 组件输出路径
         component.libPath = component.path.replace('/index.js', '/src/index.js').replace('/src/', '/dist/lib/').replace('.vue', '.js')
-        // libName: '@huawei/vue/todo/pc'
+        // libName: '@opentiny/vue/todo/pc'
         component.libName = component.libPath
           .replace('packages/', '')
           .replace('/index', '')

diff --git a/build/runtime-utils.js b/build/runtime-utils.js
@@ -154,8 +154,8 @@ const dependencies = {
   axios: 'node_modules/axios/dist/axios.min.js',
   'axios-mock-adapter': 'node_modules/axios-mock-adapter/dist/axios-mock-adapter.min.js',
   '@vue/composition-api': 'node_modules/@vue/composition-api/dist/vue-composition-api.prod.js',
-  '@huawei/core': 'node_modules/@huawei/core/dist/aurora.min.js',
-  '@huawei/service': 'node_modules/@huawei/service/dist/aurora.service.min.js',
+  '@opentiny/core': 'node_modules/@opentiny/core/dist/aurora.min.js',
+  '@opentiny/service': 'node_modules/@opentiny/service/dist/aurora.service.min.js',
   cropperjs: 'node_modules/cropperjs/dist/cropper.min.js',
   vue3: 'example/node_modules/vue/dist/vue.global.prod.js',
   'vue3-i18n': 'example/node_modules/vue-i18n/dist/vue-i18n.global.js'
@@ -169,8 +169,8 @@ const runtimeDeps = {
     'axios-mock-adapter': 'lib/axios-mock-adapter.min.js' + getVersion('axios-mock-adapter')
   },
   aurora: {
-    '@huawei/core': 'lib/aurora.min.js' + getVersion('@huawei/core'),
-    '@huawei/service': 'lib/aurora.service.min.js' + getVersion('@huawei/service')
+    '@opentiny/core': 'lib/aurora.min.js' + getVersion('@opentiny/core'),
+    '@opentiny/service': 'lib/aurora.service.min.js' + getVersion('@opentiny/service')
   },
   tiny3Lib: {
     '@vue/composition-api': 'lib/vue-composition-api.prod.js' + getVersion('@vue/composition-api'),
@@ -265,7 +265,7 @@ const getFullRuntime = (name) => {
  * 提取 @opentiny/vue-renderless 中的公共代码，打成独立包（避免组件运行不正常）
  */
 const getRenderlessExports = () => {
-  const RENDERLESS_PATH = pathJoin('..', 'node_modules', '@huawei', 'renderless', 'common', 'runtime.js')
+  const RENDERLESS_PATH = pathJoin('..', 'node_modules', '@opentiny', 'renderless', 'common', 'runtime.js')
 
   let EXTERNAL_RENDERLESS = []
 

diff --git a/example/build/build-icon.js b/example/build/build-icon.js
@@ -45,7 +45,7 @@ const build = (icons) => {
     } else if (itconComponent.path === 'lowercase.js') {
       inputs3.external = (deps) => !deps.includes('lowercase.js')
     } else {
-      inputs3.external = (deps) => !/@huawei[\\/]tiny-vue-theme/.test(deps) && !deps.includes('index.js')
+      inputs3.external = (deps) => !/@opentiny[\\/]vue-theme/.test(deps) && !deps.includes('index.js')
     }
 
     rollup

diff --git a/example/build/config.js b/example/build/config.js
@@ -61,8 +61,7 @@ components.forEach((itemComponent) => {
 
 exports.aliasList = aliasList
 
-exports.external = (deps) =>
-  external.includes(deps) || /^@huawei[\\/](tiny-vue-renderless|tiny-vue-theme|tiny-vue-common|tiny-vue-icon)|echarts|cropperjs|quill/.test(deps)
+exports.external = (deps) => external.includes(deps) || /^@opentiny[\\/](\vue-renderless|\vue-theme|\vue-common|\vue-icon)|echarts|cropperjs|quill/.test(deps)
 
 exports.globalsMap = globals
 

diff --git a/npm-publish.js b/npm-publish.js
@@ -12,7 +12,7 @@ const publish = () => {
     const stat = fs.statSync(childPath)
 
     if (stat.isDirectory()) {
-      const cmd = `npm publish ./dist/${item}`
+      const cmd = `npm publish ./dist/${item} --access public`
       try {
         execSync(cmd, { cwd: ROOTPATH })
       } catch (error) {
@@ -24,7 +24,7 @@ const publish = () => {
           const chartChildPath = path.join(childPath, value)
           const chartStat = fs.statSync(chartChildPath)
           if (value.includes('-') && chartStat.isDirectory()) {
-            const cmd = `npm publish ./dist/chart/${value}`
+            const cmd = `npm publish ./dist/chart/${value} --access public`
             try {
               execSync(cmd, { cwd: ROOTPATH })
             } catch (error) {

diff --git a/package.json b/package.json
@@ -1,9 +1,9 @@
 {
   "name": "@opentiny/vue",
-  "version": "3.4.0",
+  "version": "3.5.0",
   "uiVersion": "0.1.0",
   "srcVersion": "0.1.0",
-  "themeVersion": "3.4.0",
+  "themeVersion": "3.5.0",
   "description": "@opentiny/vue",
   "main": "index.js",
   "repository": {
@@ -28,12 +28,12 @@
     "build:ui2": "lerna run build:ui2 --scope @opentiny/vue*",
     "buildfuxi:ui2": "lerna run build:ui2 --scope @opentiny/vue-${componentName}",
     "build:icon2": "cross-env NODE_ENV=production node build/build-icon.js",
-    "build:vue2": "npm run clean && npm run create:mapping && npm run build:entry && npm run build:ui2 && npm run build:icon2",
+    "build:vue2": "npm run clean && npm i @opentiny/vue-theme --no-save && npm run create:mapping && npm run build:entry && npm run build:ui2 && npm run build:icon2",
     "buildfuxi:vue2": "npm run clean && npm run create:mapping && npm run build:entry && npm run buildfuxi:ui2 && npm run build:icon2",
     "build:ui3": "lerna run build:ui3 --scope @opentiny/vue*",
     "buildfuxi:ui3": "lerna run build:ui3 --scope @opentiny/vue-${componentName}",
     "build:icon3": "lerna run build:icon3 --scope vue-example --stream",
-    "build:vue3": "npm run clean && npm run create:mapping && npm run build:entry && npm run build:ui3 && npm run build:icon3",
+    "build:vue3": "npm run clean && npm i @opentiny/vue-theme --no-save && npm run create:mapping && npm run build:entry && npm run build:ui3 && npm run build:icon3",
     "buildfuxi:vue3": "npm run clean && npm run create:mapping && npm run build:entry && npm run buildfuxi:ui3 && npm run build:icon3",
     "build:entry": "node build/build-entry.js",
     "build": "npm run clean && npm run build:entry",
@@ -42,17 +42,17 @@
     "build:runtime-icon": "lerna run build:runtime-icon --scope vue-example",
     "build:runtime": "npm run build:runtime-pc && npm run build:runtime-icon",
     "release3": "npm run release:ui3 && npm run release:vue3",
-    "release:vue3": "cross-env NPM_TAG=~3.4.0 NPM_WAREHOUSE=prod VERSION_TAG=3.4.0 node build/release.js",
-    "release:ui3": "cross-env NPM_TAG=~3.4.0 NPM_WAREHOUSE=prod VERSION_TAG=3.4.0 node build/release-ui.js",
+    "release:vue3": "cross-env NPM_TAG=~3.5.0 NPM_WAREHOUSE=prod VERSION_TAG=3.5.0 node build/release.js",
+    "release:ui3": "cross-env NPM_TAG=~3.5.0 NPM_WAREHOUSE=prod VERSION_TAG=3.5.0 node build/release-ui.js",
     "release2": "npm run release:ui2 && npm run release:vue2",
-    "release:vue2": "cross-env NPM_TAG=~2.4.0 NPM_WAREHOUSE=prod VERSION_TAG=2.4.0 node build/release.js",
-    "release:ui2": "cross-env NPM_TAG=~2.4.0 NPM_WAREHOUSE=prod VERSION_TAG=2.4.0 node build/release-ui.js",
+    "release:vue2": "cross-env NPM_TAG=~2.5.0 NPM_WAREHOUSE=prod VERSION_TAG=2.5.0 node build/release.js",
+    "release:ui2": "cross-env NPM_TAG=~2.5.0 NPM_WAREHOUSE=prod VERSION_TAG=2.5.0 node build/release-ui.js",
     "releasefuxi3": "npm run releasefuxi:ui3 && npm run releasefuxi:vue3",
-    "releasefuxi:vue3": "cross-env NPM_TAG=~3.4.0 NPM_WAREHOUSE=prod VERSION_TAG=${version} node build/release.js",
-    "releasefuxi:ui3": "cross-env NPM_TAG=~3.4.0 NPM_WAREHOUSE=prod VERSION_TAG=${version} node build/release-ui.js",
+    "releasefuxi:vue3": "cross-env NPM_TAG=~3.5.0 NPM_WAREHOUSE=prod VERSION_TAG=${version} node build/release.js",
+    "releasefuxi:ui3": "cross-env NPM_TAG=~3.5.0 NPM_WAREHOUSE=prod VERSION_TAG=${version} node build/release-ui.js",
     "releasefuxi2": "npm run releasefuxi:ui2 && npm run releasefuxi:vue2",
-    "releasefuxi:vue2": "cross-env NPM_TAG=~2.4.0 NPM_WAREHOUSE=prod VERSION_TAG=${version} node build/release.js",
-    "releasefuxi:ui2": "cross-env NPM_TAG=~2.4.0 NPM_WAREHOUSE=prod VERSION_TAG=${version} node build/release-ui.js",
+    "releasefuxi:vue2": "cross-env NPM_TAG=~2.5.0 NPM_WAREHOUSE=prod VERSION_TAG=${version} node build/release.js",
+    "releasefuxi:ui2": "cross-env NPM_TAG=~2.5.0 NPM_WAREHOUSE=prod VERSION_TAG=${version} node build/release-ui.js",
     "format": "prettier --write packages/**/*{.vue,.js,.jsx} example/src/**/*{.vue,.js,jsx} build/*.js example/test/*.jsx",
     "lint": "eslint packages/**/*{.vue,.js,.jsx} example/src/**/*{.vue,.js,.jsx} build/*.js --ignore-pattern \"packages/**/dist\" --ignore-pattern \"packages/**/node_modules\" --ignore-pattern \"packages/**/runtime\" --fix",
     "test": "lerna run test --scope vue-example --stream",