Skip to content

Commit cc8d44c

Browse files
NathanWalkerNathanWalker
authored
feat: webpack5 (#45)
1 parent 18dd1bc commit cc8d44c

17 files changed

+7972
-182
lines changed

‎.gitignore‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,11 @@
11
.DS_Store
22

3+
test-app/
4+
35
*.js
46
*.js.map
7+
!nativescript.webpack.js
8+
!loaders/unit-test-loader.js
59

610
coverage
711
lib-cov
@@ -32,4 +36,5 @@ npm-debug.log
3236
node_modules
3337
.d.ts
3438

35-
platforms/android/nativescript_unit_test_runner.aar
39+
platforms/android/nativescript_unit_test_runner.aar
40+
platforms/android/unit_test_runner.aar

‎app/app.css‎

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
.landingContainer {
2-
background-color: #3C5AFD;
2+
background-color: #65ADF1;
33
}
44

55
.landingBackground {
@@ -19,13 +19,8 @@
1919
color: white;
2020
vertical-align: bottom;
2121
}
22-
23-
.title {
24-
background-color: #3C5AFD;
25-
}
26-
2722
.statusBar {
28-
background-color: #3C5AFD;
23+
background-color: #65ADF1;
2924
color: white;
3025
}
3126

‎app/bundle-app.ts‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,9 @@
1+
declare let require: any;
2+
13
import { Application } from "@nativescript/core";
4+
import "./app.css"
5+
6+
const context = require.context('./', true, /.*\.(js|css|xml)/)
7+
global.registerWebpackModules(context);
8+
29
Application.run({ moduleName: "bundle-app-root" });

‎app/main-page.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Page xmlns="http://www.nativescript.org/tns.xsd" loaded="pageLoaded">
22
<GridLayout cssClass="landingContainer">
3-
<Image src="{{ imageSrc }}" stretch="none" cssClass="landingBackground"/>
3+
<Image src="{{ imageSrc }}" stretch="none" class="landingBackground"/>
44

5-
<Label text="{{ serverInfo }}" cssClass="landingText"/>
5+
<Label text="{{ serverInfo }}" class="landingText"/>
66
</GridLayout>
77
</Page>

‎app/main-view-model.ts‎

Lines changed: 1 addition & 1 deletion
Large diffs are not rendered by default.

‎app/services/karma-files-service.ts‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,26 @@
11
export class KarmaFilesService {
2-
private extensionRegex = /\.([^.\/]+)$/;
3-
private appPrefix = null;
4-
private testsPrefix = null;
5-
private nodeModulesPrefix = null;
6-
private bundle = false;
2+
private readonly extensionRegex = /\.([^.\/]+)$/;
3+
private readonly appPrefix = null;
4+
private readonly testsPrefix = null;
5+
private readonly absoluteTestsPrefix = null;
6+
private readonly nodeModulesPrefix = null;
7+
private readonly bundle: boolean = false;
78

89
constructor(private http, config: IHostConfiguration) {
910
this.appPrefix = `/base/${config.options.appDirectoryRelativePath}/`;
1011
this.testsPrefix = `/base/${config.options.appDirectoryRelativePath}/tests`;
12+
this.absoluteTestsPrefix = `/absolute`;
1113
this.nodeModulesPrefix = `/base/node_modules/`;
1214
this.bundle = config.options.bundle;
1315
}
1416

1517
public getServedFilesData(baseUrl: string): Promise<IScriptInfo[]> {
1618
const contextUrl = `${baseUrl}/context.json`;
1719
console.log("NSUTR: downloading " + contextUrl);
18-
19-
const result = this.http.getString(contextUrl)
20+
21+
return this.http.getString(contextUrl)
2022
.then(content => {
21-
var parsedContent: IKarmaContext = JSON.parse(content);
23+
const parsedContent: IKarmaContext = JSON.parse(content);
2224
return parsedContent.files;
2325
})
2426
.then(scriptUrls => {
@@ -37,14 +39,12 @@ export class KarmaFilesService {
3739
url,
3840
type,
3941
contents,
40-
shouldEval: !extension || extension.toLowerCase() === "js"
42+
shouldEval: !extension || extension.toLowerCase() === "js" || extension.toLowerCase() === "ts"
4143
};
4244
});
4345
}
4446
}));
4547
});
46-
47-
return result;
4848
}
4949

5050
private getScriptData(url: string): { extension: string, localPath: string, type: ScriptTypes } {
@@ -65,7 +65,7 @@ export class KarmaFilesService {
6565
private getScriptType(url: string): ScriptTypes {
6666
let type = ScriptTypes.CodeUnderTestType;
6767

68-
if (url.startsWith(this.testsPrefix)) {
68+
if (url.startsWith(this.testsPrefix) || url.startsWith(this.absoluteTestsPrefix)) {
6969
type = ScriptTypes.TestType;
7070
} else if (url.startsWith(this.nodeModulesPrefix)) {
7171
type = ScriptTypes.FrameworkAdapterType;
@@ -86,4 +86,4 @@ export class KarmaFilesService {
8686

8787
return localPath;
8888
}
89-
}
89+
}

‎app/services/karma-host-resolver.ts‎

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,13 @@ export class KarmaHostResolver implements IKarmaHostResolver {
22
constructor(private http) { }
33

44
public resolveKarmaHost(ips: string[], port: number): Promise<string> {
5-
const result = new Promise<string>(resolve => {
6-
var foundKarma = false;
7-
var resolvers = ips.map(ip => {
8-
var karmaClientUrl = `http://${ip}:${port}/context.json`;
5+
return new Promise<string>(resolve => {
6+
let foundKarma = false;
7+
8+
const resolvers = ips.map(ip => {
9+
const karmaClientUrl = `http://${ip}:${port}/context.json`;
910
console.log('NSUTR: fetching ' + karmaClientUrl);
11+
1012
return this.http.getString({
1113
url: karmaClientUrl,
1214
method: 'GET',
@@ -19,14 +21,13 @@ export class KarmaHostResolver implements IKarmaHostResolver {
1921
}
2022
}, () => undefined)
2123
});
24+
2225
Promise.all(resolvers)
2326
.then(() => {
2427
if (!foundKarma) {
2528
resolve(null);
2629
}
2730
})
2831
});
29-
30-
return result;
3132
}
32-
}
33+
}

‎app/services/test-execution-service.ts‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,8 @@ export class TestExecutionService implements ITestExecutionService {
2727
// WARNING in ../node_modules/@nativescript/unit-test-runner/main-view-model.js 204:28-53
2828
// Critical dependency: the request of a dependency is an expression
2929
if (!global.TNS_WEBPACK) {
30-
require(script.localPath);
30+
// @ts-ignore
31+
require(script.localPath);
3132
}
3233
} else {
3334
if (script.shouldEval) {
@@ -78,4 +79,4 @@ export class TestExecutionService implements ITestExecutionService {
7879
delete global.define;
7980
}
8081
}
81-
}
82+
}

‎app/test-run-page.xml‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
<Page xmlns="http://www.nativescript.org/tns.xsd" navigatedTo="pageNavigatedTo">
22
<GridLayout rows="*,auto,8*,auto,auto">
3-
<GridLayout row="0" columns="*,auto,*" cssClass="title">
4-
<Image src="{{ imageSrc }}" stretch="aspectFill" col="1"/>
3+
<GridLayout row="0" columns="*,auto,*" class="title">
4+
<Image src="{{ imageSrc }}" stretch="aspectFit" col="1" width="150"/>
55
</GridLayout>
66

7-
<Progress row="1" value="{{ testsRan }}" maxValue="{{ testsTotal }}" cssClass="testProgress"/>
7+
<Progress row="1" value="{{ testsRan }}" maxValue="{{ testsTotal }}" class="testProgress"/>
88

99
<StackLayout row="2" style="margin: 20px;">
10-
<Label text="{{ testsTotal, 'Total: ' + testsTotal}} " cssClass="testsTotal"/>
11-
<Label text="{{ testsPassed, 'Passed: ' + testsPassed }}" cssClass="testsPassed"/>
12-
<Label text="{{ testsFailed, 'Failed: ' + testsFailed }}" cssClass="testsFailed"/>
10+
<Label text="{{ testsTotal, 'Total: ' + testsTotal}} " class="testsTotal"/>
11+
<Label text="{{ testsPassed, 'Passed: ' + testsPassed }}" class="testsPassed"/>
12+
<Label text="{{ testsFailed, 'Failed: ' + testsFailed }}" class="testsFailed"/>
1313
<StackLayout orientation="horizontal" visibility="{{ testsRunning, testsRunning ? 'visible' : 'collapsed' }}" horizontalAlignment="left">
1414
<ActivityIndicator busy="true"/>
1515
<Label text="Testing in progress..." verticalAlignment="center"/>
@@ -18,8 +18,8 @@
1818

1919
<Button text="View Test Run Details" tap="{{ viewTestRunDetails }}" row="3"/>
2020

21-
<GridLayout row="4" cssClass="statusBar">
22-
<Label text="{{ serverInfo }}" cssClass="statusText"/>
21+
<GridLayout row="4" class="statusBar">
22+
<Label text="{{ serverInfo }}" class="statusText"/>
2323
</GridLayout>
2424
</GridLayout>
2525
</Page>

‎loaders/unit-test-loader.js‎

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
const {relative, extname, sep} = require('path');
2+
3+
/**
4+
* Unit Test Loader
5+
*
6+
* Replaces test source with a loadModule call
7+
* This allows us to use eval to run the tests
8+
* and pre-bundle them with the app.
9+
*/
10+
module.exports = function unitTestLoader(source, map) {
11+
const opts = this.getOptions();
12+
const testPathRelativeToAppPath = relative(opts.appPath, this.resourcePath);
13+
const ext = extname(testPathRelativeToAppPath);
14+
const loadPath = testPathRelativeToAppPath.replace(ext, "").replace(sep, '/'); // use forward slash always
15+
16+
source = `
17+
// UNIT-TEST-LOADER START
18+
try {
19+
console.log('Loading test: ${loadPath}');
20+
global.loadModule('${loadPath}');
21+
} catch(err) {
22+
console.log('Failed to load test ${loadPath}.', err)
23+
throw new Error('Failed to load test ${loadPath}.');
24+
}
25+
// UNIT-TEST-LOADER END
26+
`;
27+
28+
this.callback(null, source, map);
29+
};

0 commit comments

Comments
 (0)