Skip to content

Commit 3b888e3

Browse files
SvetoslavTsenovSvetoslavTsenov
committed
Merge remote-tracking branch 'origin/master' into tsenov/merger-release-in-master
2 parents 589bb43 + 1d12136 commit 3b888e3

78 files changed

Lines changed: 696 additions & 336 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎e2e/file-qualifiers/app/App_Resources/Android/src/main/res/values/strings.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<resources>
3-
<string name="app_name">TestApp</string>
4-
<string name="title_activity_kimera">TestApp</string>
3+
<string name="app_name">FileQualifiers</string>
4+
<string name="title_activity_kimera">FileQualifiers</string>
55
</resources>

‎e2e/file-qualifiers/app/app.css‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
@import '~nativescript-theme-core/css/core.light.css';
2+
13
.root-footer {
24
color: black;
35
background-color: lightgreen

‎e2e/file-qualifiers/app/app.land.css‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
/* Currently app.land.css is never loaded */
2+
@import '~nativescript-theme-core/css/lime.css';
3+
14
.root-footer {
25
color: black;
36
background-color: lightpink;

‎e2e/file-qualifiers/app/main/main-page.land.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<StackLayout class="page-content">
33
<Label text="This is LANDSACPE page" />
44

5-
<Button text="tap" tap="tap" />
5+
<Button text="tap" tap="tap" class="btn btn-primary"/>
66

77
<Button text="navigate" tap="navigate" />
88

‎e2e/file-qualifiers/app/main/main-page.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<StackLayout class="page-content">
33
<Label text="This is DEFAULT page" />
44

5-
<Button text="tap" tap="tap" />
5+
<Button text="tap" tap="tap" class="btn btn-primary" />
66

77
<Button text="navigate" tap="navigate" />
88

‎e2e/file-qualifiers/app/other/other-page.land.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<StackLayout class="page-content">
33
<Label text="This is LANDSACPE other page" />
44

5-
<Button text="tap" tap="tap" />
5+
<Button text="tap" tap="tap" class="btn btn-primary"/>
66

77
<Button text="navigate" tap="navigate" />
88

‎e2e/file-qualifiers/app/other/other-page.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<StackLayout class="page-content">
33
<Label text="This is DEFAULT other page" />
44

5-
<Button text="tap" tap="tap" />
5+
<Button text="tap" tap="tap" class="btn btn-primary"/>
66

77
<Button text="navigate" tap="navigate" />
88

‎e2e/file-qualifiers/nsconfig.json‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1 @@
1-
{
2-
"useLegacyWorkflow": false
3-
}
1+
{}

‎e2e/file-qualifiers/package.json‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,18 +6,19 @@
66
"nativescript": {
77
"id": "org.nativescript.filequalifiers",
88
"tns-ios": {
9-
"version": "6.0.0-2019-06-19-084246-01"
9+
"version": "next"
1010
},
1111
"tns-android": {
12-
"version": "6.0.0-2019-06-24-113546-01"
12+
"version": "next"
1313
}
1414
},
1515
"dependencies": {
16+
"nativescript-theme-core": "^1.0.6",
1617
"tns-core-modules": "file:../../tns-core-modules"
1718
},
1819
"devDependencies": {
1920
"nativescript-dev-webpack": "next",
2021
"tns-platform-declarations": "next",
21-
"typescript": "3.4.1"
22+
"typescript": "3.4.5"
2223
}
2324
}

‎e2e/file-qualifiers/webpack.config.js‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@ module.exports = env => {
2828

2929
// Default destination inside platforms/<platform>/...
3030
const dist = resolve(projectRoot, nsWebpack.getAppPath(platform, projectRoot));
31-
const appResourcesPlatformDir = platform === "android" ? "Android" : "iOS";
3231

3332
const {
3433
// The 'appPath' and 'appResourcesPath' values are fetched from
@@ -73,6 +72,7 @@ module.exports = env => {
7372
itemsToClean.push(`${join(projectRoot, "platforms", "android", "app", "build", "configurations", "nativescript-android-snapshot")}`);
7473
}
7574

75+
nsWebpack.processAppComponents(appComponents, platform);
7676
const config = {
7777
mode: production ? "production" : "development",
7878
context: appFullPath,
@@ -133,6 +133,7 @@ module.exports = env => {
133133
test: (module, chunks) => {
134134
const moduleName = module.nameForCondition ? module.nameForCondition() : '';
135135
return /[\\/]node_modules[\\/]/.test(moduleName) ||
136+
/[\\/]tns-core-modules[\\/]/.test(moduleName) || // <-- Needed for snapshot builds with linked modules!
136137
appComponents.some(comp => comp === moduleName);
137138

138139
},
@@ -179,13 +180,14 @@ module.exports = env => {
179180
unitTesting,
180181
appFullPath,
181182
projectRoot,
183+
ignoredFiles: nsWebpack.getUserDefinedEntries(entries, platform)
182184
}
183185
},
184186
].filter(loader => !!loader)
185187
},
186-
188+
187189
{
188-
test: /\.(ts|css|scss|less|html|xml)$/,
190+
test: /\.(ts|css|scss|html|xml)$/,
189191
use: "nativescript-dev-webpack/hmr/hot-loader"
190192
},
191193

@@ -227,7 +229,7 @@ module.exports = env => {
227229
// Define useful constants like TNS_WEBPACK
228230
new webpack.DefinePlugin({
229231
"global.TNS_WEBPACK": "true",
230-
"process": undefined,
232+
"process": "global.process",
231233
}),
232234
// Remove all files from the out dir.
233235
new CleanWebpackPlugin(itemsToClean, { verbose: !!verbose }),

0 commit comments

Comments
 (0)