dojo
diff --git a/‎package-lock.json
Copy file name to clipboard
+3,000-2,958Lines changed: 3000 additions & 2958 deletions b/‎package-lock.json
Copy file name to clipboard
+3,000-2,958Lines changed: 3000 additions & 2958 deletions
diff --git a/‎package.json
Copy file name to clipboard
+2Lines changed: 2 additions & 0 deletions b/‎package.json
Copy file name to clipboard
+2Lines changed: 2 additions & 0 deletions
diff --git a/‎src/dev.config.ts
Copy file name to clipboard
+7-1Lines changed: 7 additions & 1 deletion b/‎src/dev.config.ts
Copy file name to clipboard
+7-1Lines changed: 7 additions & 1 deletion
diff --git a/‎src/dist.config.ts
Copy file name to clipboard
+7-1Lines changed: 7 additions & 1 deletion b/‎src/dist.config.ts
Copy file name to clipboard
+7-1Lines changed: 7 additions & 1 deletion
diff --git a/‎test-app/assets/dojo.svg
Copy file name to clipboard
+90Lines changed: 90 additions & 0 deletions b/‎test-app/assets/dojo.svg
Copy file name to clipboard
+90Lines changed: 90 additions & 0 deletions
@@ -61,6 +61,7 @@
     "@dojo/cli": "~3.0.0",
     "@dojo/scripts": "~3.0.1",
     "@types/clean-webpack-plugin": "0.1.0",
+    "@types/copy-webpack-plugin": "4.4.1",
     "@types/execa": "0.8.0",
     "@types/express": "4.11.0",
     "@types/extract-text-webpack-plugin": "3.0.0",
@@ -103,6 +104,7 @@
     "auto-require-webpack-plugin": "1.0.1",
     "chalk": "2.4.1",
     "clean-webpack-plugin": "0.1.17",
+    "copy-webpack-plugin": "4.5.2",
     "cli-columns": "3.1.2",
     "css-loader": "0.28.7",
     "express": "4.16.2",
 
@@ -1,6 +1,7 @@
 import baseConfigFactory, { mainEntry, packageName } from './base.config';
 import { WebAppManifest } from './interfaces';
 import * as HtmlWebpackPlugin from 'html-webpack-plugin';
+import * as fs from 'fs';
 import * as path from 'path';
 import webpack = require('webpack');
 import { deepAssign } from '@dojo/framework/core/lang';
@@ -9,6 +10,7 @@ import ServiceWorkerPlugin, {
 	ServiceWorkerOptions
 } from '@dojo/webpack-contrib/service-worker-plugin/ServiceWorkerPlugin';
 import * as CleanWebpackPlugin from 'clean-webpack-plugin';
+import * as CopyWebpackPlugin from 'copy-webpack-plugin';
 import * as ManifestPlugin from 'webpack-manifest-plugin';
 
 const WebpackPwaManifest = require('webpack-pwa-manifest');
@@ -18,9 +20,13 @@ function webpackConfig(args: any): webpack.Configuration {
 	const manifest: WebAppManifest = args.pwa && args.pwa.manifest;
 	const serviceWorker: string | ServiceWorkerOptions = args.pwa && args.pwa.serviceWorker;
 	const { plugins, output, module } = config;
+	const outputPath = path.join(output.path!, 'dev');
+	const assetsDir = path.join(process.cwd(), 'assets');
+	const assetsDirExists = fs.existsSync(assetsDir);
 
 	config.plugins = [
 		...plugins,
+		assetsDirExists && new CopyWebpackPlugin([{ from: assetsDir, to: path.join(outputPath, 'assets') }]),
 		new ManifestPlugin(),
 		new HtmlWebpackPlugin({
 			inject: true,
@@ -80,7 +86,7 @@ function webpackConfig(args: any): webpack.Configuration {
 
 	config.output = {
 		...output,
-		path: path.join(output.path!, 'dev')
+		path: outputPath
 	};
 
 	config.devtool = 'inline-source-map';
 
@@ -1,6 +1,7 @@
 import baseConfigFactory, { mainEntry, packageName } from './base.config';
 import { WebAppManifest } from './interfaces';
 import webpack = require('webpack');
+import * as fs from 'fs';
 import * as path from 'path';
 import { deepAssign } from '@dojo/framework/core/lang';
 import BuildTimeRender from '@dojo/webpack-contrib/build-time-render/BuildTimeRender';
@@ -10,6 +11,7 @@ import ServiceWorkerPlugin, {
 import * as HtmlWebpackPlugin from 'html-webpack-plugin';
 import * as ExtractTextPlugin from 'extract-text-webpack-plugin';
 import * as CleanWebpackPlugin from 'clean-webpack-plugin';
+import * as CopyWebpackPlugin from 'copy-webpack-plugin';
 import * as ManifestPlugin from 'webpack-manifest-plugin';
 import * as WebpackChunkHash from 'webpack-chunk-hash';
 
@@ -22,9 +24,13 @@ function webpackConfig(args: any): webpack.Configuration {
 	const manifest: WebAppManifest = args.pwa && args.pwa.manifest;
 	const serviceWorker: ServiceWorkerOptions = args.pwa && args.pwa.serviceWorker;
 	const { plugins, output } = config;
+	const outputPath = path.join(output.path!, 'dist');
+	const assetsDir = path.join(process.cwd(), 'assets');
+	const assetsDirExists = fs.existsSync(assetsDir);
 
 	config.plugins = [
 		...plugins,
+		assetsDirExists && new CopyWebpackPlugin([{ from: assetsDir, to: path.join(outputPath, 'assets') }]),
 		new ManifestPlugin(),
 		new BundleAnalyzerPlugin({
 			analyzerMode: 'static',
@@ -94,7 +100,7 @@ function webpackConfig(args: any): webpack.Configuration {
 
 	config.output = {
 		...output,
-		path: path.join(output.path!, 'dist'),
+		path: outputPath,
 		chunkFilename: '[name].[chunkhash].bundle.js',
 		filename: '[name].[chunkhash].bundle.js'
 	};