Skip to content

Commit 5ab66fd

Browse files
fxy060608fxy060608
committed
fix(uasm): 调整 so 库名称前缀大小写 #17204
1 parent 6140593 commit 5ab66fd

4 files changed

Lines changed: 42 additions & 42 deletions

File tree

‎packages/uni-app-plus/__tests__/x/api/base/loadUasm.spec.ts‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ describe('loadUasm', () => {
1717
const module = { add: (a: number, b: number) => a + b }
1818
loadUasmMock.mockReturnValue(module)
1919
const modulePath =
20-
'uni_modules/test-uasm/uasm/app-android/libs/arm64-v8a/libuasmTestUasm.so'
20+
'uni_modules/test-uasm/uasm/app-android/libs/arm64-v8a/libUasmTestUasm.so'
2121

2222
const result = loadUasm<typeof module>(modulePath)
2323

@@ -30,7 +30,7 @@ describe('loadUasm', () => {
3030
const module = { add: (a: number, b: number) => a + b }
3131
loadUasmMock.mockReturnValue(module)
3232

33-
const result = loadUasm<typeof module>('libuasmTestUasm.so')
33+
const result = loadUasm<typeof module>('libUasmTestUasm.so')
3434

3535
expect(result).toBeInstanceOf(Promise)
3636
await expect(result).resolves.toBe(module)
@@ -42,29 +42,29 @@ describe('loadUasm', () => {
4242
throw error
4343
})
4444

45-
await expect(loadUasm('libuasmTestUasm.so')).rejects.toBe(error)
45+
await expect(loadUasm('libUasmTestUasm.so')).rejects.toBe(error)
4646
})
4747

4848
test('异步加载无结果时 Promise rejection', async () => {
4949
loadUasmMock.mockReturnValue(null)
5050

51-
await expect(loadUasm('libuasmTestUasm.so')).rejects.toThrow(
52-
'uni.loadUasm[libuasmTestUasm.so] 加载失败'
51+
await expect(loadUasm('libUasmTestUasm.so')).rejects.toThrow(
52+
'uni.loadUasm[libUasmTestUasm.so] 加载失败'
5353
)
5454
})
5555

5656
test('同步返回 native app 加载结果', () => {
5757
const module = { add: (a: number, b: number) => a + b }
5858
loadUasmMock.mockReturnValue(module)
5959

60-
expect(loadUasmSync<typeof module>('libuasmTestUasm.so')).toBe(module)
61-
expect(loadUasmMock).toHaveBeenCalledWith('libuasmTestUasm.so')
60+
expect(loadUasmSync<typeof module>('libUasmTestUasm.so')).toBe(module)
61+
expect(loadUasmMock).toHaveBeenCalledWith('libUasmTestUasm.so')
6262
})
6363

6464
test('同步加载无结果时返回 null', () => {
6565
loadUasmMock.mockReturnValue(null)
6666

67-
expect(loadUasmSync('libuasmTestUasm.so')).toBeNull()
67+
expect(loadUasmSync('libUasmTestUasm.so')).toBeNull()
6868
})
6969

7070
test('同步抛出 native app 加载异常', () => {
@@ -73,6 +73,6 @@ describe('loadUasm', () => {
7373
throw error
7474
})
7575

76-
expect(() => loadUasmSync('libuasmTestUasm.so')).toThrow(error)
76+
expect(() => loadUasmSync('libUasmTestUasm.so')).toThrow(error)
7777
})
7878
})

‎packages/uni-app-uts/__tests__/utils.spec.ts‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ describe('createUniOptions', () => {
5656
inputDir,
5757
'uni_modules/module-a/uasm',
5858
platform,
59-
'libs/arm64-v8a/libuasmModuleA.so'
59+
'libs/arm64-v8a/libUasmModuleA.so'
6060
),
6161
''
6262
)
@@ -65,7 +65,7 @@ describe('createUniOptions', () => {
6565
inputDir,
6666
'uni_modules/module-a/uasm',
6767
platform,
68-
'libs/armeabi-v7a/libuasmModuleA.so'
68+
'libs/armeabi-v7a/libUasmModuleA.so'
6969
),
7070
''
7171
)
@@ -74,7 +74,7 @@ describe('createUniOptions', () => {
7474
inputDir,
7575
'uni_modules/module-b/uasm',
7676
platform,
77-
'libs/x86_64/libuasmModuleB.so'
77+
'libs/x86_64/libUasmModuleB.so'
7878
),
7979
''
8080
)

‎packages/uni-cli-shared/__tests__/uasm.spec.ts‎

Lines changed: 29 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ function transformLoadUasm(
3333
resolve(modulePath) {
3434
const normalized = modulePath.replace(/^@?\//, '')
3535
if (normalized === 'uni_modules/test-uasm') {
36-
return `${normalized}/uasm/app-android/libs/arm64-v8a/libuasmTestUasm.so`
36+
return `${normalized}/uasm/app-android/libs/arm64-v8a/libUasmTestUasm.so`
3737
}
3838
},
3939
reportDiagnostic(_context, diagnostic) {
@@ -89,12 +89,12 @@ describe('uasm', () => {
8989

9090
test('resolve UASM library file name', () => {
9191
const file =
92-
'uni_modules/ustd/uasm/app-android/libs/arm64-v8a/libuasmUstd.so'
92+
'uni_modules/ustd/uasm/app-android/libs/arm64-v8a/libUasmUstd.so'
9393
fs.outputFileSync(path.join(inputDir, file), '')
9494
initUasmModules(inputDir)
9595

9696
expect(resolveUasmLoadPath('uni_modules/ustd', 'app-android', true)).toBe(
97-
'libuasmUstd.so'
97+
'libUasmUstd.so'
9898
)
9999
expect(
100100
resolveUasmLoadPath('uni_modules/ustd', 'app-android', false, [
@@ -109,7 +109,7 @@ describe('uasm', () => {
109109
fs.outputFileSync(
110110
path.join(
111111
inputDir,
112-
'uni_modules/test-uasm/uasm/app-android/libs/arm64-v8a/libuasmTestUasm.so'
112+
'uni_modules/test-uasm/uasm/app-android/libs/arm64-v8a/libUasmTestUasm.so'
113113
),
114114
''
115115
)
@@ -121,7 +121,7 @@ describe('uasm', () => {
121121
}
122122

123123
expect(options.targetArchs).toEqual(['arm64-v8a'])
124-
expect(options.resolve('uni_modules/test-uasm')).toBe('libuasmTestUasm.so')
124+
expect(options.resolve('uni_modules/test-uasm')).toBe('libUasmTestUasm.so')
125125
expect(options.createLoadUasmTransformer).toBe(createLoadUasmTransformer)
126126

127127
if (originalTargetArchs === undefined) {
@@ -141,7 +141,7 @@ describe('uasm', () => {
141141
fs.outputFileSync(
142142
path.join(
143143
inputDir,
144-
'uni_modules/test-uasm/uasm/app-android/libs/arm64-v8a/libuasmTestUasm.so'
144+
'uni_modules/test-uasm/uasm/app-android/libs/arm64-v8a/libUasmTestUasm.so'
145145
),
146146
''
147147
)
@@ -155,19 +155,19 @@ describe('uasm', () => {
155155
transformers: { before: [creator(ts).before] },
156156
}).outputText
157157
expect(transform(`uni.loadUasm('uni_modules/test-uasm')`)).toContain(
158-
'uni.loadUasm("libuasmTestUasm.so", () => uts.sdk.modules.testUasm.TestUasm)'
158+
'uni.loadUasm("libUasmTestUasm.so", () => uts.sdk.modules.testUasm.TestUasm)'
159159
)
160160
expect(
161161
transform(`uni.loadUasm<CompressionBridge>('uni_modules/test-uasm')`)
162162
).toContain(
163-
'uni.loadUasm("libuasmTestUasm.so", () => uts.sdk.modules.testUasm.TestUasm)'
163+
'uni.loadUasm("libUasmTestUasm.so", () => uts.sdk.modules.testUasm.TestUasm)'
164164
)
165165
expect(
166166
transform(
167167
`uni.loadUasmSync<CompressionBridge>('uni_modules/test-uasm')`
168168
)
169169
).toContain(
170-
'uni.loadUasmSync("libuasmTestUasm.so", () => uts.sdk.modules.testUasm.TestUasm)'
170+
'uni.loadUasmSync("libUasmTestUasm.so", () => uts.sdk.modules.testUasm.TestUasm)'
171171
)
172172
} finally {
173173
restoreEnv('UNI_APP_X_DOM2', originalDom2)
@@ -230,23 +230,23 @@ describe('uasm', () => {
230230
expect(
231231
transformLoadUasm(`uni.loadUasm<TestUASM>('${modulePath}')`)
232232
).toContain(
233-
'uni.loadUasm("uni_modules/test-uasm/uasm/app-android/libs/arm64-v8a/libuasmTestUasm.so")'
233+
'uni.loadUasm("uni_modules/test-uasm/uasm/app-android/libs/arm64-v8a/libUasmTestUasm.so")'
234234
)
235235
})
236236

237237
test('keeps other UASM load arguments', () => {
238238
expect(
239239
transformLoadUasm(`uni.loadUasm('uni_modules/test-uasm', true)`)
240240
).toContain(
241-
'uni.loadUasm("uni_modules/test-uasm/uasm/app-android/libs/arm64-v8a/libuasmTestUasm.so", true)'
241+
'uni.loadUasm("uni_modules/test-uasm/uasm/app-android/libs/arm64-v8a/libUasmTestUasm.so", true)'
242242
)
243243
})
244244

245245
test('transforms a no-substitution UASM path template literal', () => {
246246
expect(
247247
transformLoadUasm('uni.loadUasm(`uni_modules/test-uasm`)')
248248
).toContain(
249-
'uni.loadUasm("uni_modules/test-uasm/uasm/app-android/libs/arm64-v8a/libuasmTestUasm.so")'
249+
'uni.loadUasm("uni_modules/test-uasm/uasm/app-android/libs/arm64-v8a/libUasmTestUasm.so")'
250250
)
251251
})
252252

@@ -275,7 +275,7 @@ describe('uasm', () => {
275275
expect(
276276
transformLoadUasm(`uni.loadUasmSync<TestUASM>('uni_modules/test-uasm')`)
277277
).toContain(
278-
'uni.loadUasmSync("uni_modules/test-uasm/uasm/app-android/libs/arm64-v8a/libuasmTestUasm.so")'
278+
'uni.loadUasmSync("uni_modules/test-uasm/uasm/app-android/libs/arm64-v8a/libUasmTestUasm.so")'
279279
)
280280
})
281281

@@ -290,14 +290,14 @@ describe('uasm', () => {
290290
fs.outputFileSync(
291291
path.join(
292292
inputDir,
293-
'uni_modules/test-uasm/uasm/app-android/libs/arm64-v8a/libuasmTestUasm.so'
293+
'uni_modules/test-uasm/uasm/app-android/libs/arm64-v8a/libUasmTestUasm.so'
294294
),
295295
''
296296
)
297297
fs.outputFileSync(
298298
path.join(
299299
inputDir,
300-
'uni_modules/test-uasm/uasm/app-android/libs/armeabi-v7a/libuasmTestUasm.so'
300+
'uni_modules/test-uasm/uasm/app-android/libs/armeabi-v7a/libUasmTestUasm.so'
301301
),
302302
''
303303
)
@@ -318,11 +318,11 @@ describe('uasm', () => {
318318
archs: {
319319
'arm64-v8a': {
320320
dir: 'uni_modules/test-uasm/uasm/app-android/libs/arm64-v8a',
321-
file: 'uni_modules/test-uasm/uasm/app-android/libs/arm64-v8a/libuasmTestUasm.so',
321+
file: 'uni_modules/test-uasm/uasm/app-android/libs/arm64-v8a/libUasmTestUasm.so',
322322
},
323323
'armeabi-v7a': {
324324
dir: 'uni_modules/test-uasm/uasm/app-android/libs/armeabi-v7a',
325-
file: 'uni_modules/test-uasm/uasm/app-android/libs/armeabi-v7a/libuasmTestUasm.so',
325+
file: 'uni_modules/test-uasm/uasm/app-android/libs/armeabi-v7a/libUasmTestUasm.so',
326326
},
327327
},
328328
},
@@ -396,14 +396,14 @@ describe('uasm', () => {
396396
fs.outputFileSync(
397397
path.join(
398398
inputDir,
399-
'uni_modules/test-uasm/uasm/app-harmony/libs/arm64-v8a/libuasmTestUasm.so'
399+
'uni_modules/test-uasm/uasm/app-harmony/libs/arm64-v8a/libUasmTestUasm.so'
400400
),
401401
''
402402
)
403403
fs.outputFileSync(
404404
path.join(
405405
inputDir,
406-
'uni_modules/test-uasm/uasm/app-harmony/libs/armeabi-v7a/libuasmTestUasm.so'
406+
'uni_modules/test-uasm/uasm/app-harmony/libs/armeabi-v7a/libUasmTestUasm.so'
407407
),
408408
''
409409
)
@@ -420,7 +420,7 @@ describe('uasm', () => {
420420
platform: 'app-harmony',
421421
arch: 'arm64-v8a',
422422
dir: 'uni_modules/test-uasm/uasm/app-harmony/libs/arm64-v8a',
423-
file: 'uni_modules/test-uasm/uasm/app-harmony/libs/arm64-v8a/libuasmTestUasm.so',
423+
file: 'uni_modules/test-uasm/uasm/app-harmony/libs/arm64-v8a/libUasmTestUasm.so',
424424
})
425425
expect(
426426
resolveUasmTargetArch('test-uasm', 'app-harmony', ['x86_64'])
@@ -431,14 +431,14 @@ describe('uasm', () => {
431431
fs.outputFileSync(
432432
path.join(
433433
inputDir,
434-
'uni_modules/test-uasm/uasm/app-android/libs/arm64-v8a/libuasmTestUasm.so'
434+
'uni_modules/test-uasm/uasm/app-android/libs/arm64-v8a/libUasmTestUasm.so'
435435
),
436436
''
437437
)
438438
fs.outputFileSync(
439439
path.join(
440440
inputDir,
441-
'uni_modules/test-uasm/uasm/app-harmony/libs/arm64-v8a/libuasmTestUasm.so'
441+
'uni_modules/test-uasm/uasm/app-harmony/libs/arm64-v8a/libUasmTestUasm.so'
442442
),
443443
''
444444
)
@@ -452,7 +452,7 @@ describe('uasm', () => {
452452
initUasmModules(inputDir)
453453

454454
const androidFile =
455-
'uni_modules/test-uasm/uasm/app-android/libs/arm64-v8a/libuasmTestUasm.so'
455+
'uni_modules/test-uasm/uasm/app-android/libs/arm64-v8a/libUasmTestUasm.so'
456456
for (const modulePath of [
457457
'uni_modules/test-uasm',
458458
'/uni_modules/test-uasm',
@@ -466,15 +466,15 @@ describe('uasm', () => {
466466

467467
expect(
468468
resolveUasmLoadPath('uni_modules/test-uasm', 'app-android', true)
469-
).toBe('libuasmTestUasm.so')
469+
).toBe('libUasmTestUasm.so')
470470
expect(
471471
resolveUasmLoadPath('uni_modules/test-uasm', 'app-harmony', true)
472-
).toBe('libuasmTestUasm.so')
472+
).toBe('libUasmTestUasm.so')
473473
expect(
474474
resolveUasmLoadPath('uni_modules/test-uasm', 'app-harmony', false, [
475475
'arm64-v8a',
476476
])
477-
).toBe('libuasmTestUasm.so')
477+
).toBe('libUasmTestUasm.so')
478478
expect(resolveUasmLoadPath('uni_modules/test-uasm', 'app-ios', false)).toBe(
479479
'test-uasm'
480480
)
@@ -532,14 +532,14 @@ describe('uasm', () => {
532532
fs.outputFileSync(
533533
path.join(
534534
inputDir,
535-
'uni_modules/module-a/uasm/app-android/libs/arm64-v8a/libuasmModuleA.so'
535+
'uni_modules/module-a/uasm/app-android/libs/arm64-v8a/libUasmModuleA.so'
536536
),
537537
''
538538
)
539539
fs.outputFileSync(
540540
path.join(
541541
inputDir,
542-
'uni_modules/module-b/uasm/app-android/libs/x86_64/libuasmModuleB.so'
542+
'uni_modules/module-b/uasm/app-android/libs/x86_64/libUasmModuleB.so'
543543
),
544544
''
545545
)
@@ -558,7 +558,7 @@ describe('uasm', () => {
558558
test('initialize the cache when creating the Vite plugin', () => {
559559
const arm64File = path.join(
560560
inputDir,
561-
'uni_modules/test-uasm/uasm/app-android/libs/arm64-v8a/libuasmTestUasm.so'
561+
'uni_modules/test-uasm/uasm/app-android/libs/arm64-v8a/libUasmTestUasm.so'
562562
)
563563
fs.outputFileSync(arm64File, '')
564564

‎packages/uni-cli-shared/src/uasm.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -587,7 +587,7 @@ export function parseUasmModuleName(modulePath: string): string | undefined {
587587
}
588588

589589
function resolveUasmLibraryFileName(moduleName: string): string {
590-
return `libuasm${capitalize(camelize(moduleName))}.so`
590+
return `libUasm${capitalize(camelize(moduleName))}.so`
591591
}
592592

593593
export function resolveUasmWebLoad(

0 commit comments

Comments
 (0)