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

Merge branch 'master' of github.com:NativeScript/NativeScript

Browse Source 
# Conflicts:
#	package.json
#	packages/core/bundle-entry-points.ts
#	packages/core/color/color-common.ts
#	packages/core/color/index.d.ts
#	packages/core/globals/index.ts
#	packages/core/package.json
#	packages/core/ui/core/bindable/index.ts
#	packages/core/ui/core/properties/index.ts
#	packages/core/ui/core/view/index.android.ts
#	packages/core/ui/frame/index.android.ts
#	packages/core/ui/styling/style-scope.ts
#	packages/ui-mobile-base/android/gradle/wrapper/gradle-wrapper.properties
#	packages/webpack5/package.json
#	packages/webpack5/src/configuration/base.ts
This commit is contained in:
Martin Guillon
2021-09-16 10:16:45 +02:00
parent 748a6e2df8 76dacb30ee
commit e3e5dea2be
200 changed files with 199773 additions and 3798 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
apps/ui/.gitignore vendored Normal file
View File

@@ -0,0 +1 @@
!webpack.custom.config.js

5
apps/ui/nativescript.config.ts
View File

@@ -1,10 +1,11 @@
import { NativeScriptConfig } from '@nativescript/core';
export default {
id: 'org.nativescript.uitestsapp',
id: 'org.nativescript.uitestsapp',
appResourcesPath: '../../tools/assets/App_Resources',
webpackConfigPath: 'webpack.custom.config.js',
android: {
v8Flags: '--expose_gc',
markingMode: 'none'
markingMode: 'none',
},
} as NativeScriptConfig;

4
apps/ui/src/issues/issue-7469-page.ts
View File

@@ -28,7 +28,7 @@ let loaded = false;
let isIn1 = false;
function updateVcToggleText() {
vcToggle.text = `Container is${reusableItem.reusable ? ' ' : ' NOT '}Reusable`
vcToggle.text = `Container is${reusableItem.reusable ? ' ' : ' NOT '}Reusable`;
}
export function pageLoaded(args) {
@@ -82,7 +82,7 @@ export function makeReusable(args: EventData) {
}
(args.object as any).___reusableRan = true;
(args.object as any).reusable = true;
if(args.object === reusableItem) {
if (args.object === reusableItem) {
updateVcToggleText();
}
}

18
apps/ui/webpack.custom.config.js Normal file
View File

@@ -0,0 +1,18 @@
const webpack = require('webpack');
const CopyWebpackPlugin = require('copy-webpack-plugin');
const webpackConfig = require('./webpack.config');
module.exports = (env) => {
env = env || {};
const baseConfig = webpackConfig(env);
baseConfig.plugins.push(new webpack.DefinePlugin({
__CI__: !!process.env.CI,
__UI_USE_XML_PARSER__: true,
__UI_USE_EXTERNAL_RENDERER__: false,
__CSS_PARSER__: JSON.stringify('css-tree')
}))
return baseConfig;
};