javascript/NativeScript
1
0
Fork 0
mirror of https://github.com/NativeScript/NativeScript.git synced 2025-08-17 04:41:36 +08:00
Code Issues Packages Projects Releases Wiki Activity

refactor(webpack): drop custom flavor helper & explicitly set in each config

Browse Source
This commit is contained in:
Igor Randjelovic
2021-08-29 18:08:05 +02:00
committed by Nathan Walker
parent 5452b89735
commit 3bdc34aec3
15 changed files with 63 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
packages/webpack5/__tests__/configuration/__snapshots__/angular.spec.ts.snap
View File

@ -311,6 +311,8 @@ exports[`angular configuration for android 1`] = `
__NS_ENV_VERBOSE__: false,
__NS_DEV_HOST_IPS__: '[\\"127.0.0.1\\",\\"192.168.0.10\\"]',
__CSS_PARSER__: '\\"css-tree\\"',
__UI_USE_XML_PARSER__: true,
__UI_USE_EXTERNAL_RENDERER__: true,
__ANDROID__: true,
__IOS__: false,
'global.isAndroid': true,
@ -696,6 +698,8 @@ exports[`angular configuration for ios 1`] = `
__NS_ENV_VERBOSE__: false,
__NS_DEV_HOST_IPS__: '[\\"127.0.0.1\\",\\"192.168.0.10\\"]',
__CSS_PARSER__: '\\"css-tree\\"',
__UI_USE_XML_PARSER__: true,
__UI_USE_EXTERNAL_RENDERER__: true,
__ANDROID__: false,
__IOS__: true,
'global.isAndroid': false,

4
packages/webpack5/__tests__/configuration/__snapshots__/base.spec.ts.snap
View File

@ -247,6 +247,8 @@ exports[`base configuration for android 1`] = `
__NS_ENV_VERBOSE__: false,
__NS_DEV_HOST_IPS__: '[\\"127.0.0.1\\",\\"192.168.0.10\\"]',
__CSS_PARSER__: '\\"css-tree\\"',
__UI_USE_XML_PARSER__: true,
__UI_USE_EXTERNAL_RENDERER__: false,
__ANDROID__: true,
__IOS__: false,
'global.isAndroid': true,
@ -555,6 +557,8 @@ exports[`base configuration for ios 1`] = `
__NS_ENV_VERBOSE__: false,
__NS_DEV_HOST_IPS__: '[\\"127.0.0.1\\",\\"192.168.0.10\\"]',
__CSS_PARSER__: '\\"css-tree\\"',
__UI_USE_XML_PARSER__: true,
__UI_USE_EXTERNAL_RENDERER__: false,
__ANDROID__: false,
__IOS__: true,
'global.isAndroid': false,

4
packages/webpack5/__tests__/configuration/__snapshots__/javascript.spec.ts.snap
View File

@ -264,6 +264,8 @@ exports[`javascript configuration for android 1`] = `
__NS_ENV_VERBOSE__: false,
__NS_DEV_HOST_IPS__: '[\\"127.0.0.1\\",\\"192.168.0.10\\"]',
__CSS_PARSER__: '\\"css-tree\\"',
__UI_USE_XML_PARSER__: true,
__UI_USE_EXTERNAL_RENDERER__: false,
__ANDROID__: true,
__IOS__: false,
'global.isAndroid': true,
@ -594,6 +596,8 @@ exports[`javascript configuration for ios 1`] = `
__NS_ENV_VERBOSE__: false,
__NS_DEV_HOST_IPS__: '[\\"127.0.0.1\\",\\"192.168.0.10\\"]',
__CSS_PARSER__: '\\"css-tree\\"',
__UI_USE_XML_PARSER__: true,
__UI_USE_EXTERNAL_RENDERER__: false,
__ANDROID__: false,
__IOS__: true,
'global.isAndroid': false,

8
packages/webpack5/__tests__/configuration/__snapshots__/react.spec.ts.snap
View File

@ -262,6 +262,8 @@ exports[`react configuration > android > adds ReactRefreshWebpackPlugin when HMR
__NS_ENV_VERBOSE__: false,
__NS_DEV_HOST_IPS__: '[\\"127.0.0.1\\",\\"192.168.0.10\\"]',
__CSS_PARSER__: '\\"css-tree\\"',
__UI_USE_XML_PARSER__: true,
__UI_USE_EXTERNAL_RENDERER__: true,
__ANDROID__: true,
__IOS__: false,
'global.isAndroid': true,
@ -581,6 +583,8 @@ exports[`react configuration > android > base config 1`] = `
__NS_ENV_VERBOSE__: false,
__NS_DEV_HOST_IPS__: '[\\"127.0.0.1\\",\\"192.168.0.10\\"]',
__CSS_PARSER__: '\\"css-tree\\"',
__UI_USE_XML_PARSER__: true,
__UI_USE_EXTERNAL_RENDERER__: true,
__ANDROID__: true,
__IOS__: false,
'global.isAndroid': true,
@ -900,6 +904,8 @@ exports[`react configuration > ios > adds ReactRefreshWebpackPlugin when HMR ena
__NS_ENV_VERBOSE__: false,
__NS_DEV_HOST_IPS__: '[\\"127.0.0.1\\",\\"192.168.0.10\\"]',
__CSS_PARSER__: '\\"css-tree\\"',
__UI_USE_XML_PARSER__: true,
__UI_USE_EXTERNAL_RENDERER__: true,
__ANDROID__: false,
__IOS__: true,
'global.isAndroid': false,
@ -1220,6 +1226,8 @@ exports[`react configuration > ios > base config 1`] = `
__NS_ENV_VERBOSE__: false,
__NS_DEV_HOST_IPS__: '[\\"127.0.0.1\\",\\"192.168.0.10\\"]',
__CSS_PARSER__: '\\"css-tree\\"',
__UI_USE_XML_PARSER__: true,
__UI_USE_EXTERNAL_RENDERER__: true,
__ANDROID__: false,
__IOS__: true,
'global.isAndroid': false,

4
packages/webpack5/__tests__/configuration/__snapshots__/svelte.spec.ts.snap
View File

@ -273,6 +273,8 @@ exports[`svelte configuration for android 1`] = `
__NS_ENV_VERBOSE__: false,
__NS_DEV_HOST_IPS__: '[\\"127.0.0.1\\",\\"192.168.0.10\\"]',
__CSS_PARSER__: '\\"css-tree\\"',
__UI_USE_XML_PARSER__: true,
__UI_USE_EXTERNAL_RENDERER__: true,
__ANDROID__: true,
__IOS__: false,
'global.isAndroid': true,
@ -601,6 +603,8 @@ exports[`svelte configuration for ios 1`] = `
__NS_ENV_VERBOSE__: false,
__NS_DEV_HOST_IPS__: '[\\"127.0.0.1\\",\\"192.168.0.10\\"]',
__CSS_PARSER__: '\\"css-tree\\"',
__UI_USE_XML_PARSER__: true,
__UI_USE_EXTERNAL_RENDERER__: true,
__ANDROID__: false,
__IOS__: true,
'global.isAndroid': false,

4
packages/webpack5/__tests__/configuration/__snapshots__/typescript.spec.ts.snap
View File

@ -264,6 +264,8 @@ exports[`typescript configuration for android 1`] = `
__NS_ENV_VERBOSE__: false,
__NS_DEV_HOST_IPS__: '[\\"127.0.0.1\\",\\"192.168.0.10\\"]',
__CSS_PARSER__: '\\"css-tree\\"',
__UI_USE_XML_PARSER__: true,
__UI_USE_EXTERNAL_RENDERER__: false,
__ANDROID__: true,
__IOS__: false,
'global.isAndroid': true,
@ -594,6 +596,8 @@ exports[`typescript configuration for ios 1`] = `
__NS_ENV_VERBOSE__: false,
__NS_DEV_HOST_IPS__: '[\\"127.0.0.1\\",\\"192.168.0.10\\"]',
__CSS_PARSER__: '\\"css-tree\\"',
__UI_USE_XML_PARSER__: true,
__UI_USE_EXTERNAL_RENDERER__: false,
__ANDROID__: false,
__IOS__: true,
'global.isAndroid': false,

4
packages/webpack5/__tests__/configuration/__snapshots__/vue.spec.ts.snap
View File

@ -287,6 +287,8 @@ exports[`vue configuration for android 1`] = `
__NS_ENV_VERBOSE__: false,
__NS_DEV_HOST_IPS__: '[\\"127.0.0.1\\",\\"192.168.0.10\\"]',
__CSS_PARSER__: '\\"css-tree\\"',
__UI_USE_XML_PARSER__: true,
__UI_USE_EXTERNAL_RENDERER__: true,
__ANDROID__: true,
__IOS__: false,
'global.isAndroid': true,
@ -629,6 +631,8 @@ exports[`vue configuration for ios 1`] = `
__NS_ENV_VERBOSE__: false,
__NS_DEV_HOST_IPS__: '[\\"127.0.0.1\\",\\"192.168.0.10\\"]',
__CSS_PARSER__: '\\"css-tree\\"',
__UI_USE_XML_PARSER__: true,
__UI_USE_EXTERNAL_RENDERER__: true,
__ANDROID__: false,
__IOS__: true,
'global.isAndroid': false,

2
packages/webpack5/package.json
View File

@ -46,7 +46,7 @@
"ts-dedent": "^2.0.0",
"ts-loader": "^9.0.0",
"vue-loader": "^15.0.0",
"webpack": "5.50.0",
"webpack": "^5.30.0 <= 5.50.0",
"webpack-bundle-analyzer": "^4.0.0",
"webpack-chain": "^6.0.0",
"webpack-cli": "^4.0.0",

9
packages/webpack5/src/configuration/angular.ts
View File

@ -1,4 +1,5 @@
import { extname, resolve } from 'path';
import { merge } from 'webpack-merge';
import Config from 'webpack-chain';
import { existsSync } from 'fs';
@ -222,6 +223,14 @@ export default function (config: Config, env: IWebpackEnv = _env): Config {
])
);
config.plugin('DefinePlugin').tap((args) => {
args[0] = merge(args[0], {
__UI_USE_EXTERNAL_RENDERER__: true,
});
return args;
});
return config;
}

3
packages/webpack5/src/configuration/base.ts
View File

@ -15,7 +15,6 @@ import { applyFileReplacements } from '../helpers/fileReplacements';
import { addCopyRule, applyCopyRules } from '../helpers/copyRules';
import { WatchStatePlugin } from '../plugins/WatchStatePlugin';
import { getProjectFilePath } from '../helpers/project';
import { projectUsesCustomFlavor } from '../helpers/flavor';
import { hasDependency } from '../helpers/dependencies';
import { applyDotEnvPlugin } from '../helpers/dotEnv';
import { env as _env, IWebpackEnv } from '../index';
@ -354,7 +353,7 @@ export default function (config: Config, env: IWebpackEnv = _env): Config {
mode === 'development' ? JSON.stringify(getIPS()) : `[]`,
__CSS_PARSER__: JSON.stringify(getValue('cssParser', 'css-tree')),
__UI_USE_XML_PARSER__: true,
__UI_USE_EXTERNAL_RENDERER__: projectUsesCustomFlavor(),
__UI_USE_EXTERNAL_RENDERER__: false,
__ANDROID__: platform === 'android',
__IOS__: platform === 'ios',
/* for compat only */ 'global.isAndroid': platform === 'android',

1
packages/webpack5/src/configuration/react.ts
View File

@ -26,6 +26,7 @@ export default function (config: Config, env: IWebpackEnv = _env): Config {
args[0] = merge(args[0], {
/** For various libraries in the React ecosystem. */
__TEST__: false,
__UI_USE_EXTERNAL_RENDERER__: true,
/**
* Primarily for React Fast Refresh plugin, but technically the allowHmrInProduction option could be used instead.
* Worth including anyway, as there are plenty of Node libraries that use this flag.

11
packages/webpack5/src/configuration/svelte.ts
View File

@ -1,11 +1,12 @@
import { merge } from 'webpack-merge';
import Config from 'webpack-chain';
import { getProjectFilePath } from '../helpers/project';
import { hasDependency } from '../helpers/dependencies';
import { getPlatformName } from '../helpers/platform';
import { env as _env, IWebpackEnv } from '../index';
import { error } from '../helpers/log';
import base from './base';
import { hasDependency } from '../helpers/dependencies';
export default function (config: Config, env: IWebpackEnv = _env): Config {
base(config, env);
@ -84,6 +85,14 @@ export default function (config: Config, env: IWebpackEnv = _env): Config {
});
}
config.plugin('DefinePlugin').tap((args) => {
args[0] = merge(args[0], {
__UI_USE_EXTERNAL_RENDERER__: true,
});
return args;
});
return config;
}

8
packages/webpack5/src/configuration/vue.ts
View File

@ -88,6 +88,14 @@ export default function (config: Config, env: IWebpackEnv = _env): Config {
// add an alias for vue, since some plugins may try to import it
config.resolve.alias.set('vue', 'nativescript-vue');
config.plugin('DefinePlugin').tap((args) => {
args[0] = merge(args[0], {
__UI_USE_EXTERNAL_RENDERER__: true,
});
return args;
});
return config;
}

11
packages/webpack5/src/helpers/flavor.ts
View File

@ -2,17 +2,6 @@ import { defaultConfigs } from '@nativescript/webpack';
import { getAllDependencies } from './dependencies';
import { error } from './log';
/**
* Utility to determine if the project uses an external flavor/framework
*/
export function projectUsesCustomFlavor(): boolean {
const projectFlavor = determineProjectFlavor();
return (
projectFlavor &&
['vue', 'angular', 'react', 'svelte'].includes(projectFlavor)
);
}
/**
* Utility to determine the project flavor based on installed dependencies
* (vue, angular, react, svelete, typescript, javascript...)

3
packages/webpack5/src/helpers/index.ts
View File

@ -9,7 +9,7 @@ import { addVirtualEntry, addVirtualModule } from './virtualModules';
import { applyFileReplacements } from './fileReplacements';
import { addCopyRule, removeCopyRule } from './copyRules';
import { error, info, warn, warnOnce } from './log';
import { determineProjectFlavor, projectUsesCustomFlavor } from './flavor';
import { determineProjectFlavor } from './flavor';
import { getValue } from './config';
import { getIPS } from './host';
import {
@ -47,7 +47,6 @@ export default {
},
flavor: {
determineProjectFlavor,
projectUsesCustomFlavor,
},
host: {
getIPS,