javascript/NativeScript
1
0
Fork 0
mirror of https://github.com/NativeScript/NativeScript.git synced 2025-11-05 13:26:48 +08:00
Code Issues Packages Projects Releases Wiki Activity

refactor: return of missing css errors

Browse Source
This commit is contained in:
vakrilov
2019-07-16 11:01:43 +03:00
parent 78058087c8
commit 9113a04d80
17 changed files with 117 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
e2e/file-qualifiers/app/App_Resources/Android/src/main/res/values/strings.xml
View File

@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<string name="app_name">TestApp</string>
<string name="title_activity_kimera">TestApp</string>
<string name="app_name">FileQualifiers</string>
<string name="title_activity_kimera">FileQualifiers</string>
</resources>

2
e2e/file-qualifiers/app/app.css
View File

@@ -1,3 +1,5 @@
@import '~nativescript-theme-core/css/core.light.css';
.root-footer {
color: black;
background-color: lightgreen

3
e2e/file-qualifiers/app/app.land.css
View File

@@ -1,3 +1,6 @@
/* Currently app.land.css is never loaded */
@import '~nativescript-theme-core/css/lime.css';
.root-footer {
color: black;
background-color: lightpink;

2
e2e/file-qualifiers/app/main/main-page.land.xml
View File

@@ -2,7 +2,7 @@
<StackLayout class="page-content">
<Label text="This is LANDSACPE page" />
<Button text="tap" tap="tap" />
<Button text="tap" tap="tap" class="btn btn-primary"/>
<Button text="navigate" tap="navigate" />

2
e2e/file-qualifiers/app/main/main-page.xml
View File

@@ -2,7 +2,7 @@
<StackLayout class="page-content">
<Label text="This is DEFAULT page" />
<Button text="tap" tap="tap" />
<Button text="tap" tap="tap" class="btn btn-primary" />
<Button text="navigate" tap="navigate" />

2
e2e/file-qualifiers/app/other/other-page.land.xml
View File

@@ -2,7 +2,7 @@
<StackLayout class="page-content">
<Label text="This is LANDSACPE other page" />
<Button text="tap" tap="tap" />
<Button text="tap" tap="tap" class="btn btn-primary"/>
<Button text="navigate" tap="navigate" />

2
e2e/file-qualifiers/app/other/other-page.xml
View File

@@ -2,7 +2,7 @@
<StackLayout class="page-content">
<Label text="This is DEFAULT other page" />
<Button text="tap" tap="tap" />
<Button text="tap" tap="tap" class="btn btn-primary"/>
<Button text="navigate" tap="navigate" />

4
e2e/file-qualifiers/nsconfig.json
View File

@@ -1,3 +1 @@
{
"useLegacyWorkflow": false
}
{}

7
e2e/file-qualifiers/package.json
View File

@@ -6,18 +6,19 @@
"nativescript": {
"id": "org.nativescript.filequalifiers",
"tns-ios": {
"version": "6.0.0-2019-06-19-084246-01"
"version": "next"
},
"tns-android": {
"version": "6.0.0-2019-06-24-113546-01"
"version": "next"
}
},
"dependencies": {
"nativescript-theme-core": "^1.0.6",
"tns-core-modules": "file:../../tns-core-modules"
},
"devDependencies": {
"nativescript-dev-webpack": "next",
"tns-platform-declarations": "next",
"typescript": "3.4.1"
"typescript": "3.4.5"
}
}

10
e2e/file-qualifiers/webpack.config.js
View File

@@ -28,7 +28,6 @@ module.exports = env => {
// Default destination inside platforms/<platform>/...
const dist = resolve(projectRoot, nsWebpack.getAppPath(platform, projectRoot));
const appResourcesPlatformDir = platform === "android" ? "Android" : "iOS";
const {
// The 'appPath' and 'appResourcesPath' values are fetched from
@@ -73,6 +72,7 @@ module.exports = env => {
itemsToClean.push(`${join(projectRoot, "platforms", "android", "app", "build", "configurations", "nativescript-android-snapshot")}`);
}
nsWebpack.processAppComponents(appComponents, platform);
const config = {
mode: production ? "production" : "development",
context: appFullPath,
@@ -133,6 +133,7 @@ module.exports = env => {
test: (module, chunks) => {
const moduleName = module.nameForCondition ? module.nameForCondition() : '';
return /[\\/]node_modules[\\/]/.test(moduleName) ||
/[\\/]tns-core-modules[\\/]/.test(moduleName) || // <-- Needed for snapshot builds with linked modules!
appComponents.some(comp => comp === moduleName);
},
@@ -179,13 +180,14 @@ module.exports = env => {
unitTesting,
appFullPath,
projectRoot,
ignoredFiles: nsWebpack.getUserDefinedEntries(entries, platform)
}
},
].filter(loader => !!loader)
},
{
test: /\.(ts|css|scss|less|html|xml)$/,
test: /\.(ts|css|scss|html|xml)$/,
use: "nativescript-dev-webpack/hmr/hot-loader"
},
@@ -227,7 +229,7 @@ module.exports = env => {
// Define useful constants like TNS_WEBPACK
new webpack.DefinePlugin({
"global.TNS_WEBPACK": "true",
"process": undefined,
"process": "global.process",
}),
// Remove all files from the out dir.
new CleanWebpackPlugin(itemsToClean, { verbose: !!verbose }),