From 704b3bbcd7b3571bb24965fdc3d9b9df1f337a25 Mon Sep 17 00:00:00 2001 From: Theo Bentum Date: Fri, 7 May 2021 10:45:34 -0700 Subject: [PATCH] Remove content build (#17121) * Remove content build again * Fix appRegistryPath * Comment old CopyPlugin * Update landing page template --- config/webpack.config.js | 44 ++++++++++----------- jenkins/build.sh | 2 +- script/build.sh | 8 ++-- src/platform/landing-pages/dev-template.ejs | 2 +- 4 files changed, 28 insertions(+), 28 deletions(-) diff --git a/config/webpack.config.js b/config/webpack.config.js index 927bf5d63d3d..e93624b0fb05 100644 --- a/config/webpack.config.js +++ b/config/webpack.config.js @@ -286,16 +286,16 @@ module.exports = (env = {}) => { } // Copy over image assets for when metalsmith is removed - // baseConfig.plugins.push( - // new CopyPlugin({ - // patterns: [ - // { - // from: 'src/site/assets', - // to: path.join(outputPath, '..', ''), - // }, - // ], - // }), - // ); + baseConfig.plugins.push( + new CopyPlugin({ + patterns: [ + { + from: 'src/site/assets', + to: path.join(outputPath, '..', ''), + }, + ], + }), + ); // Optionally generate landing pages in the absence of a content build. if (buildOptions.scaffold) { @@ -347,7 +347,7 @@ module.exports = (env = {}) => { }, []) .join(''); - const appRegistryPath = 'src/applications/registry.json'; + const appRegistryPath = '../content-build/src/applications/registry.json'; let appRegistry; if (fs.existsSync(appRegistryPath)) { @@ -378,7 +378,7 @@ module.exports = (env = {}) => { widgetType, widgetTemplate, facilitySidebar, - + rootUrl, // Default template metadata. breadcrumbs_override: [], // eslint-disable-line camelcase includeBreadcrumbs: false, @@ -407,16 +407,16 @@ module.exports = (env = {}) => { ); // Copy over image assets to fill in the header and other content. - baseConfig.plugins.push( - new CopyPlugin({ - patterns: [ - { - from: 'src/site/assets/img', - to: path.join(outputPath, '..', 'img'), - }, - ], - }), - ); + // baseConfig.plugins.push( + // new CopyPlugin({ + // patterns: [ + // { + // from: 'src/site/assets/img', + // to: path.join(outputPath, '..', 'img'), + // }, + // ], + // }), + // ); // Open the browser to either --env.openTo or one of the root URLs of the // apps we're scaffolding diff --git a/jenkins/build.sh b/jenkins/build.sh index a302b4cf0e16..61f6a47dc0ed 100755 --- a/jenkins/build.sh +++ b/jenkins/build.sh @@ -51,6 +51,6 @@ done # exit code. In this case, if the build command fails, the tee # command won't trick Jenkins into thinking the step passed. set -o pipefail -npm --no-color run build -- --verbose --buildtype="$envName" --asset-source="$assetSource" --drupal-address="$drupalAddress" --drupal-max-parallel-requests="$drupalMaxParallelRequests" "$omitdebug" "$pullDrupal" "$noDrupalProxy" 2>&1 | tee "$buildLog" +npm --no-color run build -- --verbose --scaffold --buildtype="$envName" --asset-source="$assetSource" --drupal-address="$drupalAddress" --drupal-max-parallel-requests="$drupalMaxParallelRequests" "$omitdebug" "$pullDrupal" "$noDrupalProxy" 2>&1 | tee "$buildLog" exit $? diff --git a/script/build.sh b/script/build.sh index 1a471b0d44ab..110aec9e5282 100755 --- a/script/build.sh +++ b/script/build.sh @@ -75,7 +75,7 @@ else fi # Build the content -if [ -n "${forceContentBuild}" ] || [ "${buildtype}" != "vagovdev" ] -then - yarn build:content $args -fi +# if [ -n "${forceContentBuild}" ] || [ "${buildtype}" != "vagovdev" ] +# then +# yarn build:content $args +# fi diff --git a/src/platform/landing-pages/dev-template.ejs b/src/platform/landing-pages/dev-template.ejs index 08872b83c656..e43b56ff5844 100644 --- a/src/platform/landing-pages/dev-template.ejs +++ b/src/platform/landing-pages/dev-template.ejs @@ -151,7 +151,7 @@ <% if (widgetType) { %> <% if (widgetTemplate == 'navigation/facility_sidebar_nav') { %> <% } %>