naming and use output path from config

guardian · Jan 13, 2025 · 36202e6 · 36202e6
1 parent ee6893f
commit 36202e6
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 27 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -150,6 +150,6 @@ jobs:
           configPath: ./riff-raff.yaml
           contentDirectories: |
             frontend-static/commercial:
-              - dist/riff-raff/js/commercial
+              - dist/prod/artifacts/commercial
             commercial-bundle-path:
-              - dist/riff-raff/cloudformation
+              - dist/prod/cloudformation
diff --git a/webpack.config.prod.mjs b/webpack.config.prod.mjs
@@ -27,7 +27,7 @@ export default merge(config, {
 	output: {
 		filename: `commercial/${prefix}graun.standalone.commercial.js`,
 		chunkFilename: `commercial/${prefix}graun.[name].commercial.js`,
-		path: join(import.meta.dirname, 'dist', 'riff-raff', 'js'),
+		path: join(import.meta.dirname, 'dist', 'prod', 'artifacts'),
 		publicPath: 'auto',
 		clean: true,
 	},

diff --git a/webpack/prout-plugin.mjs b/webpack/prout-plugin.mjs
@@ -9,27 +9,11 @@ export class PROutPlugin {
 	 * @param {import('webpack').Compiler} compiler
 	 */
 	apply = (compiler) => {
-		compiler.hooks.afterEmit.tap('AfterEmitPlugin', () => {
+		compiler.hooks.afterEmit.tap('AfterEmitPlugin', (compilation) => {
 			const commitSHA = execSync('git rev-parse HEAD').toString().trim();
 
-			compiler.outputFileSystem.mkdirSync(
-				join(
-					import.meta.dirname,
-					'..',
-					'dist',
-					'riff-raff',
-					'js',
-					'commercial',
-				),
-				{ recursive: true },
-			);
-
 			const outputPath = join(
-				import.meta.dirname,
-				'..',
-				'dist',
-				'riff-raff',
-				'js',
+				compilation.outputOptions.path,
 				'commercial',
 				`prout`,
 			);

diff --git a/webpack/update-parameter-store-plugin.mjs b/webpack/update-parameter-store-plugin.mjs
@@ -49,20 +49,16 @@ export class UpdateParameterStorePlugin {
 
 				const output = JSON.stringify(cloudformation, null, 2);
 				const outputPath = join(
-					import.meta.dirname,
+					compilation.outputOptions.path,
 					'..',
-					'dist',
-					'riff-raff',
 					'cloudformation',
 					`${stage}.json`,
 				);
 
 				compiler.outputFileSystem.mkdirSync(
 					join(
-						import.meta.dirname,
+						compilation.outputOptions.path,
 						'..',
-						'dist',
-						'riff-raff',
 						'cloudformation',
 					),
 					{ recursive: true },