Skip to content

Commit

Permalink
test: use bcrypt instead of node-addon (#6036)
Browse files Browse the repository at this point in the history
  • Loading branch information
ygj6 committed Dec 9, 2021
1 parent 8161d4a commit e1d82fc
Show file tree
Hide file tree
Showing 11 changed files with 166 additions and 285 deletions.
1 change: 0 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -11,4 +11,3 @@ explorations
/packages/vite/LICENSE
*.cpuprofile
/.vscode/
/packages/playground/ssr-deps/node-addon/build/
6 changes: 4 additions & 2 deletions packages/playground/ssr-deps/__tests__/ssr-deps.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,11 @@ const url = `http://localhost:${port}`
* NOTE: This test will always succeed now, unless the temporary workaround for Jest can be removed
* See https://github.com/vitejs/vite/pull/5197#issuecomment-938054077
*/
test('msg from node addon', async () => {
test('msg should be encrypted', async () => {
await page.goto(url)
expect(await page.textContent('.node-addon-msg')).toMatch('Hello World!')
expect(await page.textContent('.encrypted-msg')).not.toMatch(
'Secret Message!'
)
})

test('msg read by fs/promises', async () => {
Expand Down
3 changes: 0 additions & 3 deletions packages/playground/ssr-deps/node-addon/README.md

This file was deleted.

10 changes: 0 additions & 10 deletions packages/playground/ssr-deps/node-addon/binding.gyp

This file was deleted.

3 changes: 0 additions & 3 deletions packages/playground/ssr-deps/node-addon/index.js

This file was deleted.

15 changes: 0 additions & 15 deletions packages/playground/ssr-deps/node-addon/main.cpp

This file was deleted.

11 changes: 0 additions & 11 deletions packages/playground/ssr-deps/node-addon/package.json

This file was deleted.

10 changes: 5 additions & 5 deletions packages/playground/ssr-deps/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,12 @@
"postinstall": "node ../../../scripts/patchFileDeps.cjs"
},
"dependencies": {
"node-addon": "link:./node-addon",
"primitive-export": "link:./primitive-export",
"bcrypt": "^5.0.1",
"forwarded-export": "file:./forwarded-export",
"object-assigned-exports": "file:./object-assigned-exports",
"primitive-export": "file:./primitive-export",
"read-file-content": "file:./read-file-content",
"ts-transpiled-exports": "link:./ts-transpiled-exports",
"object-assigned-exports": "link:./object-assigned-exports",
"forwarded-export": "link:./forwarded-export"
"ts-transpiled-exports": "file:./ts-transpiled-exports"
},
"devDependencies": {
"cross-env": "^7.0.3",
Expand Down
6 changes: 3 additions & 3 deletions packages/playground/ssr-deps/src/app.js
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
import path from 'path'
import { hello } from 'node-addon'
import readFileContent from 'read-file-content'
import primitiveExport from 'primitive-export'
import tsDefaultExport, { hello as tsNamedExport } from 'ts-transpiled-exports'
import objectAssignedExports from 'object-assigned-exports'
import forwardedExport from 'forwarded-export'
import bcrypt from 'bcrypt'

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

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

const fileContent = await readFileContent(path.resolve(rootDir, 'message'))
html += `\n<p class="file-message">msg read via fs/promises: ${fileContent}</p>`
Expand Down
7 changes: 2 additions & 5 deletions packages/playground/ssr-deps/vite.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,7 @@
* @type {import('vite').UserConfig}
*/
module.exports = {
resolve: {
// The dependency `node-addon` needs to be linked to node_modules and preserve symlinks,
// because the `.node` file cannot be unlinked in Windows after being filed to node_modules
// ref: https://github.com/nodejs/node/issues/24878/
preserveSymlinks: true
ssr: {
external: ['object-assigned-exports']
}
}

0 comments on commit e1d82fc

Please sign in to comment.