replace @jayfate/path with path (#34)

Co-authored-by: 72161674 <[email protected]>
hapjs-platform · Jun 16, 2023 · 0c2f926 · 0c2f926
1 parent 4c3b44b
commit 0c2f926
Show file tree

Hide file tree

Showing 73 changed files with 82 additions and 80 deletions.
diff --git a/packages/hap-compiler/src/style/index.js b/packages/hap-compiler/src/style/index.js
@@ -4,7 +4,7 @@
  */
 
 'use strict'
-import path from '@jayfate/path'
+import path from 'path'
 import css from 'css'
 import { compileOptionsObject } from '@hap-toolkit/shared-utils'
 import { validate as validateDelaration, mightReferlocalResource } from './validator'

diff --git a/packages/hap-compiler/src/style/process.js b/packages/hap-compiler/src/style/process.js
@@ -5,7 +5,7 @@
 
 'use strict'
 import fs from 'fs'
-import path from '@jayfate/path'
+import path from 'path'
 import css from 'css'
 import cssWhat from 'css-what'
 import { extend, compileOptionsObject } from '@hap-toolkit/shared-utils'

diff --git a/packages/hap-compiler/src/template/validator.js b/packages/hap-compiler/src/template/validator.js
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import path from '@jayfate/path'
+import path from 'path'
 import { colorconsole, extend } from '@hap-toolkit/shared-utils'
 import exp from './exp'
 import styler from '../style'

diff --git a/packages/hap-compiler/src/utils.js b/packages/hap-compiler/src/utils.js
@@ -5,7 +5,7 @@
 
 // TODO duplicate of packager/src/common/utils.js
 import fs from 'fs'
-import path from '@jayfate/path'
+import path from 'path'
 import { globalConfig } from '@hap-toolkit/shared-utils'
 
 /**

diff --git a/packages/hap-debugger/src/router/index.js b/packages/hap-debugger/src/router/index.js
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import path from '@jayfate/path'
+import path from 'path'
 import KoaRouter from 'koa-router'
 import koaBody from 'koa-body'
 import serve from 'koa-static'

diff --git a/packages/hap-debugger/src/router/routes.js b/packages/hap-debugger/src/router/routes.js
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import path from '@jayfate/path'
+import path from 'path'
 import fs from 'fs'
 
 import qr from 'qr-image'

diff --git a/packages/hap-dev-utils/src/index.js b/packages/hap-dev-utils/src/index.js
@@ -7,7 +7,7 @@ const process = require('process')
 const fs = require('fs-extra')
 const { spawn } = require('child_process')
 const JSZip = require('jszip')
-const path = require('@jayfate/path')
+const path = require('path')
 const glob = require('glob')
 
 /**

diff --git a/packages/hap-dsl-xvm/__tests__/loaders/app-loader.test.js b/packages/hap-dsl-xvm/__tests__/loaders/app-loader.test.js
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-const path = require('@jayfate/path')
+const path = require('path')
 const { rowify } = require('hap-dev-utils')
 const appLoader = require('../../lib/loaders/app-loader').default
 

diff --git a/packages/hap-dsl-xvm/__tests__/loaders/ux-loader.test.js b/packages/hap-dsl-xvm/__tests__/loaders/ux-loader.test.js
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-const path = require('@jayfate/path')
+const path = require('path')
 const { rowify } = require('hap-dev-utils')
 const uxLoader = require('../../lib/loaders/ux-loader').default
 const { compileOptionsObject } = require('@hap-toolkit/shared-utils')

diff --git a/packages/hap-dsl-xvm/src/loaders/common/utils.js b/packages/hap-dsl-xvm/src/loaders/common/utils.js
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import path from '@jayfate/path'
+import path from 'path'
 import loaderUtils from 'loader-utils'
 import hash from 'hash-sum'
 import { SourceMapGenerator, SourceMapConsumer } from 'source-map'
@@ -235,7 +235,5 @@ export function convertPath(filePath) {
   if (/^[/\\]node_modules/.test(filePath)) {
     pathBase = globalConfig.projectPath
   }
-  return process.platform === 'win32'
-    ? path.join(pathBase, filePath).replace(/\//g, '\\')
-    : path.join(pathBase, filePath)
+  return path.join(pathBase, filePath)
 }
diff --git a/packages/hap-dsl-xvm/src/loaders/ux-fragment-utils.js b/packages/hap-dsl-xvm/src/loaders/ux-fragment-utils.js
@@ -4,7 +4,7 @@
  */
 
 import { sync as resolveSync } from 'resolve'
-import path from '@jayfate/path'
+import path from 'path'
 import { globalConfig, compileOptionsObject } from '@hap-toolkit/shared-utils'
 import { getBabelConfigJsPath } from '@hap-toolkit/packager'
 import { ENTRY_TYPE, FRAG_TYPE, templater } from '@hap-toolkit/compiler'

diff --git a/packages/hap-dsl-xvm/src/loaders/ux-loader.js b/packages/hap-dsl-xvm/src/loaders/ux-loader.js
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import path from '@jayfate/path'
+import path from 'path'
 import loaderUtils from 'loader-utils'
 import { parseFragmentsWithCache, ENTRY_TYPE, templater } from '@hap-toolkit/compiler'
 import { globalConfig, compileOptionsObject } from '@hap-toolkit/shared-utils'

diff --git a/packages/hap-dsl-xvm/src/template.js b/packages/hap-dsl-xvm/src/template.js
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import path from '@jayfate/path'
+import path from 'path'
 
 export const template = {
   app: {

diff --git a/packages/hap-dsl-xvm/test/unit/func/part.test.js b/packages/hap-dsl-xvm/test/unit/func/part.test.js
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-const path = require('@jayfate/path')
+const path = require('path')
 const { resolveTestEntries, compileFiles } = require('../../utils')
 
 describe('分包测试', () => {

diff --git a/packages/hap-dsl-xvm/test/unit/func/processImport.test.js b/packages/hap-dsl-xvm/test/unit/func/processImport.test.js
@@ -5,7 +5,7 @@
 
 
 'use strict'
-const path = require('@jayfate/path')
+const path = require('path')
 const { processImport } = require('@hap-toolkit/compiler')
 const testCssDir = path.resolve(__dirname, '../../case/ux/Helloworld/Common')
 

diff --git a/packages/hap-dsl-xvm/test/unit/ux/card.test.js b/packages/hap-dsl-xvm/test/unit/ux/card.test.js
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-const path = require('@jayfate/path')
+const path = require('path')
 const { wipeDynamic } = require('hap-dev-utils')
 const { resolveTestEntries, compileFiles } = require('../../utils')
 

diff --git a/packages/hap-dsl-xvm/test/unit/ux/component.test.js b/packages/hap-dsl-xvm/test/unit/ux/component.test.js
@@ -4,7 +4,7 @@
  */
 
 
-const path = require('@jayfate/path')
+const path = require('path')
 const { wipeDynamic } = require('hap-dev-utils')
 const { resolveTestEntries, compileFiles } = require('../../utils')
 

diff --git a/packages/hap-dsl-xvm/test/unit/ux/sign.test.js b/packages/hap-dsl-xvm/test/unit/ux/sign.test.js
@@ -6,7 +6,7 @@
 'use strict'
 
 const fs = require('fs')
-const path = require('@jayfate/path')
+const path = require('path')
 const { mkdirsSync } = require('@hap-toolkit/shared-utils')
 const { doSign } = require('@hap-toolkit/packager')
 

diff --git a/packages/hap-dsl-xvm/test/unit/ux/style.test.js b/packages/hap-dsl-xvm/test/unit/ux/style.test.js
@@ -4,7 +4,7 @@
  */
 
 
-const path = require('@jayfate/path')
+const path = require('path')
 const { wipeDynamic } = require('hap-dev-utils')
 const { resolveTestEntries, compileFiles } = require('../../utils')
 

diff --git a/packages/hap-dsl-xvm/test/unit/ux/template.test.js b/packages/hap-dsl-xvm/test/unit/ux/template.test.js
@@ -4,7 +4,7 @@
  */
 
 
-const path = require('@jayfate/path')
+const path = require('path')
 const { wipeDynamic } = require('hap-dev-utils')
 const { resolveTestEntries, compileFiles } = require('../../utils')
 

diff --git a/packages/hap-dsl-xvm/test/utils.js b/packages/hap-dsl-xvm/test/utils.js
@@ -5,7 +5,7 @@
 
 'use strict'
 
-import path from '@jayfate/path'
+import path from 'path'
 import fs from 'fs-extra'
 import glob from 'glob'
 import del from 'del'

diff --git a/packages/hap-dsl-xvm/test/webpack.config.js b/packages/hap-dsl-xvm/test/webpack.config.js
@@ -4,7 +4,7 @@
  */
 
 import { sync as resolveSync } from 'resolve'
-import path from '@jayfate/path'
+import path from 'path'
 import webpack from 'webpack'
 import { ResourcePlugin, HandlerPlugin, ZipPlugin } from '@hap-toolkit/packager'
 import { compileOptionsMeta } from '@hap-toolkit/shared-utils'

diff --git a/packages/hap-packager/src/common/info.js b/packages/hap-packager/src/common/info.js
@@ -4,7 +4,7 @@
  */
 
 import fs from 'fs'
-import path from '@jayfate/path'
+import path from 'path'
 import { readJson } from '@hap-toolkit/shared-utils'
 
 export const name = {

diff --git a/packages/hap-packager/src/common/utils.js b/packages/hap-packager/src/common/utils.js
@@ -4,7 +4,7 @@
  */
 
 import fs from 'fs'
-import path from '@jayfate/path'
+import path from 'path'
 import crypto from 'crypto'
 import { sync as resolveSync } from 'resolve'
 

diff --git a/packages/hap-packager/src/loaders/device-type-loader.js b/packages/hap-packager/src/loaders/device-type-loader.js
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import path from '@jayfate/path'
+import path from 'path'
 import fs from 'fs'
 import { getOptions } from 'loader-utils'
 

diff --git a/packages/hap-packager/src/loaders/manifest-loader.js b/packages/hap-packager/src/loaders/manifest-loader.js
@@ -4,7 +4,7 @@
  */
 
 'use strict'
-import path from '@jayfate/path'
+import path from 'path'
 import fs from 'fs'
 import loaderUtils from 'loader-utils'
 

diff --git a/packages/hap-packager/src/plugins/device-type-plugin.js b/packages/hap-packager/src/plugins/device-type-plugin.js
@@ -4,7 +4,7 @@
  */
 
 import fs from 'fs'
-import path from '@jayfate/path'
+import path from 'path'
 import { colorconsole } from '@hap-toolkit/shared-utils'
 import { mergeDeep } from '../common/utils'
 

diff --git a/packages/hap-packager/src/plugins/resource-plugin.js b/packages/hap-packager/src/plugins/resource-plugin.js
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import path from '@jayfate/path'
+import path from 'path'
 import fs from 'fs-extra'
 import aaptjs from '@hap-toolkit/aaptjs'
 import glob from 'glob'

diff --git a/packages/hap-packager/src/plugins/splitchunks-adapt-plugin.js b/packages/hap-packager/src/plugins/splitchunks-adapt-plugin.js
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import path from '@jayfate/path'
+import path from 'path'
 import Compilation from 'webpack/lib/Compilation'
 import { getEntryFiles } from '../common/info'
 import { compileOptionsMeta } from '@hap-toolkit/shared-utils'

diff --git a/packages/hap-packager/src/plugins/zip-plugin.js b/packages/hap-packager/src/plugins/zip-plugin.js
@@ -4,7 +4,7 @@
  */
 
 import fs from 'fs-extra'
-import path from '@jayfate/path'
+import path from 'path'
 import {
   colorconsole,
   readJson,

diff --git a/packages/hap-packager/src/router/routes.js b/packages/hap-packager/src/router/routes.js
@@ -4,7 +4,7 @@
  */
 
 import fs from 'fs-extra'
-import path from '@jayfate/path'
+import path from 'path'
 import qr from 'qr-image'
 import moment from 'moment'
 

diff --git a/packages/hap-packager/src/router/service.js b/packages/hap-packager/src/router/service.js
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import path from '@jayfate/path'
+import path from 'path'
 import fs from 'fs'
 import { colorconsole, getIPv4IPAddress, getClientIPAddress } from '@hap-toolkit/shared-utils'
 

diff --git a/packages/hap-packager/src/signature/index.js b/packages/hap-packager/src/signature/index.js
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import path from '@jayfate/path'
+import path from 'path'
 
 import { calcDataDigest } from '../common/utils'
 

diff --git a/packages/hap-packager/src/subpackages/service.js b/packages/hap-packager/src/subpackages/service.js
@@ -4,7 +4,7 @@
  */
 
 import fs from 'fs'
-import path from '@jayfate/path'
+import path from 'path'
 
 import { compileOptionsMeta } from '@hap-toolkit/shared-utils'
 import { calcDataDigest } from '../common/utils'
@@ -77,7 +77,7 @@ function allocateResourceToPackages(files, base, fullPackage, subPackages, build
 
   files.forEach((fileBuildPath) => {
     const fileAbsPath = path.join(base, fileBuildPath)
-    const fileContentBuffer = fs.readFileSync(fileAbsPath)
+    const fileContentBuffer = fs.readFileSync(fileAbsPath.replace(/\\/g, '/'))
     const fileContentDigest = calcDataDigest(fileContentBuffer)
     // 资源基本信息
     const resourceInfo = [fileBuildPath, fileContentBuffer, fileContentDigest]
@@ -95,7 +95,7 @@ function allocateResourceToPackages(files, base, fullPackage, subPackages, build
     let belongToBasePkg = true
 
     // 将base包的page-chunks.json文件放在包根路径，其余在分包目录下
-    if (fileBuildPath === basePageChunksJson) {
+    if (fileBuildPath === basePageChunksJson.replace(/\\/g, '/')) {
       resourceInfo[0] = SPLIT_CHUNKS_PAGE_NAME
     }
 

diff --git a/packages/hap-packager/src/webpack.post.js b/packages/hap-packager/src/webpack.post.js
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import path from '@jayfate/path'
+import path from 'path'
 import { sync as resolveSync } from 'resolve'
 import {
   globalConfig,

diff --git a/packages/hap-server/src/config/index.js b/packages/hap-server/src/config/index.js
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import path from '@jayfate/path'
+import path from 'path'
 
 // 路径
 const pathToolkit = path.resolve(__dirname, '../../..')

diff --git a/packages/hap-server/src/preview/create-preview.js b/packages/hap-server/src/preview/create-preview.js
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import path from '@jayfate/path'
+import path from 'path'
 import Koa from 'koa'
 import mount from 'koa-mount'
 import koaStatic from 'koa-static'

diff --git a/packages/hap-server/src/preview/create-router.js b/packages/hap-server/src/preview/create-router.js
@@ -4,7 +4,7 @@
  */
 
 import fs from 'fs'
-import path from '@jayfate/path'
+import path from 'path'
 import { PassThrough } from 'stream'
 import util from 'util'
 import KoaRouter from 'koa-router'

diff --git a/packages/hap-server/src/preview/index.js b/packages/hap-server/src/preview/index.js
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import path from '@jayfate/path'
+import path from 'path'
 import mount from 'koa-mount'
 import { globalConfig } from '@hap-toolkit/shared-utils'
 import createPreview from './create-preview'

diff --git a/packages/hap-server/src/preview/remote-preview.js b/packages/hap-server/src/preview/remote-preview.js
@@ -5,7 +5,7 @@
 
 import crypto from 'crypto'
 import chalk from 'chalk'
-import path from '@jayfate/path'
+import path from 'path'
 import inquirer from 'inquirer'
 import { enc, HmacSHA256, MD5 } from 'crypto-js'
 import request from 'request'

diff --git a/packages/hap-server/src/preview/shared.js b/packages/hap-server/src/preview/shared.js
@@ -4,7 +4,7 @@
  */
 
 import fs from 'fs'
-import path from '@jayfate/path'
+import path from 'path'
 import util from 'util'
 import { renderString } from '@hap-toolkit/shared-utils'