Skip to content

Commit e1d82fc

Browse files
authored
test: use bcrypt instead of node-addon (#6036)
1 parent 8161d4a commit e1d82fc

File tree

11 files changed

+166
-285
lines changed

11 files changed

+166
-285
lines changed

.gitignore

-1
Original file line numberDiff line numberDiff line change
@@ -11,4 +11,3 @@ explorations
1111
/packages/vite/LICENSE
1212
*.cpuprofile
1313
/.vscode/
14-
/packages/playground/ssr-deps/node-addon/build/

packages/playground/ssr-deps/__tests__/ssr-deps.spec.ts

+4-2
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,11 @@ const url = `http://localhost:${port}`
88
* NOTE: This test will always succeed now, unless the temporary workaround for Jest can be removed
99
* See https://github.com/vitejs/vite/pull/5197#issuecomment-938054077
1010
*/
11-
test('msg from node addon', async () => {
11+
test('msg should be encrypted', async () => {
1212
await page.goto(url)
13-
expect(await page.textContent('.node-addon-msg')).toMatch('Hello World!')
13+
expect(await page.textContent('.encrypted-msg')).not.toMatch(
14+
'Secret Message!'
15+
)
1416
})
1517

1618
test('msg read by fs/promises', async () => {

packages/playground/ssr-deps/node-addon/README.md

-3
This file was deleted.

packages/playground/ssr-deps/node-addon/binding.gyp

-10
This file was deleted.

packages/playground/ssr-deps/node-addon/index.js

-3
This file was deleted.

packages/playground/ssr-deps/node-addon/main.cpp

-15
This file was deleted.

packages/playground/ssr-deps/node-addon/package.json

-11
This file was deleted.

packages/playground/ssr-deps/package.json

+5-5
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,12 @@
99
"postinstall": "node ../../../scripts/patchFileDeps.cjs"
1010
},
1111
"dependencies": {
12-
"node-addon": "link:./node-addon",
13-
"primitive-export": "link:./primitive-export",
12+
"bcrypt": "^5.0.1",
13+
"forwarded-export": "file:./forwarded-export",
14+
"object-assigned-exports": "file:./object-assigned-exports",
15+
"primitive-export": "file:./primitive-export",
1416
"read-file-content": "file:./read-file-content",
15-
"ts-transpiled-exports": "link:./ts-transpiled-exports",
16-
"object-assigned-exports": "link:./object-assigned-exports",
17-
"forwarded-export": "link:./forwarded-export"
17+
"ts-transpiled-exports": "file:./ts-transpiled-exports"
1818
},
1919
"devDependencies": {
2020
"cross-env": "^7.0.3",

packages/playground/ssr-deps/src/app.js

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
11
import path from 'path'
2-
import { hello } from 'node-addon'
32
import readFileContent from 'read-file-content'
43
import primitiveExport from 'primitive-export'
54
import tsDefaultExport, { hello as tsNamedExport } from 'ts-transpiled-exports'
65
import objectAssignedExports from 'object-assigned-exports'
76
import forwardedExport from 'forwarded-export'
7+
import bcrypt from 'bcrypt'
88

99
export async function render(url, rootDir) {
1010
let html = ''
1111

12-
const nodeAddonMsg = hello()
13-
html += `\n<p class="node-addon-msg">message from node addon: ${nodeAddonMsg}</p>`
12+
const encryptedMsg = await bcrypt.hash('Secret Message!', 10)
13+
html += `\n<p class="encrypted-msg">encrypted message: ${encryptedMsg}</p>`
1414

1515
const fileContent = await readFileContent(path.resolve(rootDir, 'message'))
1616
html += `\n<p class="file-message">msg read via fs/promises: ${fileContent}</p>`

packages/playground/ssr-deps/vite.config.js

+2-5
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,7 @@
22
* @type {import('vite').UserConfig}
33
*/
44
module.exports = {
5-
resolve: {
6-
// The dependency `node-addon` needs to be linked to node_modules and preserve symlinks,
7-
// because the `.node` file cannot be unlinked in Windows after being filed to node_modules
8-
// ref: https://github.com/nodejs/node/issues/24878/
9-
preserveSymlinks: true
5+
ssr: {
6+
external: ['object-assigned-exports']
107
}
118
}

0 commit comments

Comments
 (0)