Merge pull request #925 from ml5js/bomani.development-build-port

joeyklee · web-flow · commit e9f053a19678 · 2020-04-21T10:32:39.000-04:00
Specify webpack-dev-server port
diff --git a/webpack.common.babel.js b/webpack.common.babel.js
@@ -8,6 +8,7 @@ import { join, resolve } from 'path';
 const include = join(__dirname, 'src');
 
 export const indexEntryWithBabel = ['babel-polyfill', './src/index.js'];
+export const developmentPort = 8080;
 
 export default {
   name: 'ml5',
diff --git a/webpack.dev.babel.js b/webpack.dev.babel.js
@@ -5,7 +5,7 @@
 
 import { join } from 'path';
 import merge from 'webpack-merge';
-import common from './webpack.common.babel';
+import common, {developmentPort} from './webpack.common.babel';
 import HtmlWebpackPlugin from 'html-webpack-plugin';
 
 export default merge(common, {
@@ -15,6 +15,7 @@ export default merge(common, {
     watchContentBase: true,
     contentBase: join(__dirname, './dist'),
     disableHostCheck: true,
+    port: developmentPort,
   },
   plugins: [
     new HtmlWebpackPlugin({
diff --git a/webpack.prod.babel.js b/webpack.prod.babel.js
@@ -5,7 +5,7 @@
 
 import merge from 'webpack-merge';
 import { resolve } from 'path';
-import common, {indexEntryWithBabel} from './webpack.common.babel';
+import common, {indexEntryWithBabel, developmentPort} from './webpack.common.babel';
 import UglifyJSPlugin from 'uglifyjs-webpack-plugin';
 import CopyPlugin from 'copy-webpack-plugin';
 
@@ -15,7 +15,7 @@ const replaceML5Reference = (content, path) => {
     return content;
   }
 
-  return content.toString().replace('http://localhost:8080/ml5.js', 'https://unpkg.com/ml5@latest/dist/ml5.min.js');
+  return content.toString().replace(`http://localhost:${developmentPort}/ml5.js`, 'https://unpkg.com/ml5@latest/dist/ml5.min.js');
 }
 
 const libraryBuildConfig = merge(common, {
diff --git a/webpack.test.babel.js b/webpack.test.babel.js
@@ -7,7 +7,7 @@ import { existsSync, mkdirSync, writeFileSync, lstatSync } from 'fs';
 import { join } from 'path';
 import assert from 'assert';
 import merge from 'webpack-merge';
-import common from './webpack.common.babel';
+import common, {developmentPort} from './webpack.common.babel';
 
 // this is the function to initialize manual-test folder when running `npm run start`
 (function checkExperimentsFolder() {
@@ -27,7 +27,7 @@ import common from './webpack.common.babel';
       <html>
       <head>
         <title>ml5.js manual test</title>
-        <script src="http://localhost:8080/ml5.js"></script>
+        <script src="http://localhost:${developmentPort}/ml5.js"></script>
       </head>
       <body>
         <script>

Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@`
`5`	`5`
`6`	`6`	`import merge from 'webpack-merge';`
`7`	`7`	`import { resolve } from 'path';`
`8`		`-import common, {indexEntryWithBabel} from './webpack.common.babel';`
	`8`	`+import common, {indexEntryWithBabel, developmentPort} from './webpack.common.babel';`
`9`	`9`	`import UglifyJSPlugin from 'uglifyjs-webpack-plugin';`
`10`	`10`	`import CopyPlugin from 'copy-webpack-plugin';`
`11`	`11`
`@@ -15,7 +15,7 @@ const replaceML5Reference = (content, path) => {`
`15`	`15`	`return content;`
`16`	`16`	`}`
`17`	`17`
`18`		`- return content.toString().replace('http://localhost:8080/ml5.js', 'https://unpkg.com/ml5@latest/dist/ml5.min.js');`
	`18`	+ return content.toString().replace(`http://localhost:${developmentPort}/ml5.js`, 'https://unpkg.com/ml5@latest/dist/ml5.min.js');
`19`	`19`	`}`
`20`	`20`
`21`	`21`	`const libraryBuildConfig = merge(common, {`