Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "nullstack",
"version": "0.15.3",
"version": "0.15.4",
"description": "Full-stack Javascript Components for one-dev armies",
"main": "nullstack.js",
"author": "Mortaro",
Expand Down
10 changes: 9 additions & 1 deletion tests/src/LazyComponent.njs
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,17 @@ import Nullstack from 'nullstack';

class LazyComponent extends Nullstack {

static async serverFunctionWorks() {
return true
}

async initiate() {
this.safelisted = await this.serverFunctionWorks()
}

render() {
return (
<div data-lazy> LazyComponent </div>
<div data-lazy data-safelisted={this.safelisted}> LazyComponent </div>
)
}

Expand Down
6 changes: 6 additions & 0 deletions tests/src/LazyComponent.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -10,4 +10,10 @@ describe('LazyComponent', () => {
expect(element).toBeTruthy();
});

test('lazy components need to be safelisted in order to call server functions', async () => {
await page.waitForSelector('[data-safelisted]');
const element = await page.$('[data-safelisted]');
expect(element).toBeTruthy();
});

});
5 changes: 5 additions & 0 deletions tests/src/LazyComponentLoader.njs
Original file line number Diff line number Diff line change
@@ -1,9 +1,14 @@
import Nullstack from 'nullstack';
import LazyComponentSafelist from './LazyComponent'

let LazyComponent

class LazyComponentLoader extends Nullstack {

static async start() {
LazyComponentSafelist.safelist()
}

async hydrate() {
LazyComponent = (await import('./LazyComponent')).default
}
Expand Down
4 changes: 3 additions & 1 deletion webpack.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -129,6 +129,7 @@ function server(env, argv) {
output: {
path: path.join(dir, folder),
filename: 'server.js',
chunkFilename: '[chunkhash].server.js',
libraryTarget: 'umd'
},
resolve: {
Expand Down Expand Up @@ -252,7 +253,8 @@ function client(env, argv) {
output: {
publicPath: `/`,
path: path.join(dir, folder),
filename: 'client.js'
filename: 'client.js',
chunkFilename: '[chunkhash].client.js',
},
resolve: {
extensions: ['.njs', '.js', '.nts', '.ts', '.tsx', '.jsx']
Expand Down