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

fix(webpack): support other workspace config styles

Browse Source
This commit is contained in:
Nathan Walker
2021-01-13 16:07:14 -08:00
parent 882aa42e85
commit 7a79a8988b
1 changed files with 31 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

55
packages/webpack/helpers/angular-config-parser.js vendored
View File

@ -21,21 +21,26 @@ const parseWorkspaceConfig = function(platform, envConfigs, projectName, debug)
if (workspaceConfig && projectName) { if (workspaceConfig && projectName) {
const projectSettings = workspaceConfig.projects[projectName]; const projectSettings = workspaceConfig.projects[projectName];
if (projectSettings) { if (projectSettings) {
var targetProp = 'architect';
if (!projectSettings.architect) {
targetProp = 'targets'; // Nx
}
// default project configurations // default project configurations
for (const envConfig of envConfigs) { for (const envConfig of envConfigs) {
if (projectSettings.architect.default && projectSettings.architect.default.configurations) { if (projectSettings[targetProp]) {
const defaultConfigurations = projectSettings.architect.default.configurations; if (projectSettings[targetProp].default && projectSettings[targetProp].default.configurations) {
if (defaultConfigurations && defaultConfigurations[envConfig]) { const defaultConfigurations = projectSettings[targetProp].default.configurations;
if (defaultConfigurations[envConfig].fileReplacements) { if (defaultConfigurations && defaultConfigurations[envConfig]) {
for (const fileReplace of defaultConfigurations[envConfig].fileReplacements) { if (defaultConfigurations[envConfig].fileReplacements) {
if (debug) { for (const fileReplace of defaultConfigurations[envConfig].fileReplacements) {
console.log('project fileReplacement:', fileReplace); if (debug) {
} console.log('project fileReplacement:', fileReplace);
if (fileReplace.replace.indexOf('.ts') > -1) { }
fileReplacements[resolve(__dirname, `${rootPath}${fileReplace.replace}`)] = resolve(__dirname, `${rootPath}${fileReplace.with}`); if (fileReplace.replace.indexOf('.ts') > -1) {
} else { fileReplacements[resolve(__dirname, `${rootPath}${fileReplace.replace}`)] = resolve(__dirname, `${rootPath}${fileReplace.with}`);
copyReplacements.push({ from: resolve(__dirname, `${rootPath}${fileReplace.with}`), to: resolve(__dirname, `${rootPath}${fileReplace.replace}`), force: true }); } else {
copyReplacements.push({ from: resolve(__dirname, `${rootPath}${fileReplace.with}`), to: resolve(__dirname, `${rootPath}${fileReplace.replace}`), force: true });
}
} }
} }
} }
@ -44,17 +49,19 @@ const parseWorkspaceConfig = function(platform, envConfigs, projectName, debug)
} }
// platform specific configurations (always override top level project configurations) // platform specific configurations (always override top level project configurations)
for (const envConfig of envConfigs) { for (const envConfig of envConfigs) {
if (projectSettings.architect && projectSettings.architect[platform]) { if (projectSettings[targetProp]) {
const platformConfig = projectSettings.architect[platform].configurations; if (projectSettings[targetProp] && projectSettings[targetProp][platform]) {
if (platformConfig && platformConfig[envConfig] && platformConfig[envConfig].fileReplacements) { const platformConfig = projectSettings[targetProp][platform].configurations;
for (const fileReplace of platformConfig[envConfig].fileReplacements) { if (platformConfig && platformConfig[envConfig] && platformConfig[envConfig].fileReplacements) {
if (debug) { for (const fileReplace of platformConfig[envConfig].fileReplacements) {
console.log(`"${platform}" specific fileReplacement:`, fileReplace); if (debug) {
} console.log(`"${platform}" specific fileReplacement:`, fileReplace);
if (fileReplace.replace.indexOf('.ts') > -1) { }
fileReplacements[resolve(__dirname, `${rootPath}${fileReplace.replace}`)] = resolve(__dirname, `${rootPath}${fileReplace.with}`); if (fileReplace.replace.indexOf('.ts') > -1) {
} else { fileReplacements[resolve(__dirname, `${rootPath}${fileReplace.replace}`)] = resolve(__dirname, `${rootPath}${fileReplace.with}`);
copyReplacements.push({ from: resolve(__dirname, `${rootPath}${fileReplace.with}`), to: resolve(__dirname, `${rootPath}${fileReplace.replace}`), force: true }); } else {
copyReplacements.push({ from: resolve(__dirname, `${rootPath}${fileReplace.with}`), to: resolve(__dirname, `${rootPath}${fileReplace.replace}`), force: true });
}
} }
} }
} }