Skip to content

Commit 3da0b4b

Browse files
committed
Merge branch 'main' into model-handpose
2 parents f4cbd8e + 9365cd9 commit 3da0b4b

File tree

5 files changed

+68
-10
lines changed

5 files changed

+68
-10
lines changed

CONTRIBUTING.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,9 @@ You should see something similar to this in the terminal:
2525
webpack 5.76.1 compiled successfully in 8360 ms
2626
```
2727

28-
A local server have been started and hosts a built version of the ml5 library at http://localhost:8080/ml5.js. While the server is running, Webpack will automatically rebuild the library if you change and save any file in the `/src` folder.
28+
A local server have been started and hosts a built version of the ml5 library at http://localhost:8080/dist/ml5.js. While the server is running, Webpack will automatically rebuild the library if you change and save any file in the `/src` folder.
2929

30-
Open `examples/NeuralNetwork/index.html` in the browser to see the live build of `ml5.js` working in some example code.
30+
A webpage at http://localhost:8080/examples/ should automatically open with the directory listing of the example directory. Select one of the directories to test run `ml5.js` in some example code.
3131

3232
## Code Formatting
3333

LICENSE.md

Lines changed: 49 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,49 @@
1+
# ml5.js LICENSE
2+
3+
_Version 1.0 of the ml5.js license was adopted and last updated on May 10, 2021. It applies to all contributions to the ml5.js library as of May 20,2021. Contributions prior to that date are licensed under the MIT license. You can read the blog post announcing and explaining the development of the license [here](https://ml5js.medium.com/6b0e4c109b76)._
4+
5+
## Purpose
6+
7+
This license gives everyone as much permission to work with this software as possible as long as they comply with the ml5.js [Code of Conduct](https://github.com/ml5js/Code-of-Conduct), while protecting contributors from liability.
8+
9+
## Acceptance
10+
11+
In order to receive this license, you must agree to its rules. The rules of this license are both obligations under that agreement and conditions to your license. You must not do anything with this software that triggers a rule that you cannot or will not follow.
12+
13+
## Copyright
14+
15+
Each contributor licenses you to do everything with this software that would otherwise infringe that contributor’s copyright in it.
16+
17+
## License Reversion
18+
19+
Each contribution to this software is licensed under this license for three years from the date it is contributed to the software. After that three year period the contribution is licensed under the [Blue Oak Model License v 1.0.0](https://blueoakcouncil.org/license/1.0.0).
20+
21+
## Code of Conduct
22+
23+
You must use this software in compliance with the ml5.js [Code of Conduct](https://github.com/ml5js/Code-of-Conduct) as it exists at the time of your use. This includes cooperating with any investigations of your compliance with the ml5.js Code of Conduct.
24+
25+
## Notices
26+
27+
You must ensure that everyone who gets a copy of any part of this software from you, with or without changes, also gets the text of this license or a link to https://ml5js.org/license.
28+
29+
## Excuse
30+
31+
If anyone notifies you in writing that you have not complied with [Notices](https://github.com/ml5js/Code-of-Conduct/blob/main/LICENSE.md#notices), you can keep your license by taking all practical steps to comply within 30 days after the notice. If you do not do so, your license ends immediately.
32+
33+
If anyone notifies you in writing that you have not complied with the Code of Conduct, you can keep your license by taking all practical steps to comply within 30 days after the notice. If you do not do so, and the ml5.js Code of Conduct Committee (or its equivalent or successor) agrees that you are in violation of the Code of Conduct, your license ends immediately.
34+
35+
## Patent
36+
37+
Each contributor licenses you to do everything with this software that would otherwise infringe any patent claims they can license or become able to license.
38+
39+
## Reliability
40+
41+
No contributor can revoke this license.
42+
43+
## No Liability
44+
45+
**_As far as the law allows, this software comes as is, without any warranty or condition, and no contributor will be liable to anyone for any damages related to this software or this license, under any kind of legal claim._**
46+
47+
## Permission
48+
49+
Each contributor licenses you to do everything with this license that would otherwise infringe that contributor’s copyright in it.

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,6 @@ You should see something similar to this in the terminal:
2929
webpack 5.76.1 compiled successfully in 8360 ms
3030
```
3131

32-
A local server have been started and hosts a built version of the ml5 library at http://localhost:8080/ml5.js. While the server is running, Webpack will automatically rebuild the library if you change and save any file in the `/src` folder.
32+
A local server have been started and hosts a built version of the ml5 library at http://localhost:8080/dist/ml5.js. While the server is running, Webpack will automatically rebuild the library if you change and save any file in the `/src` folder.
3333

34-
Open `examples/NeuralNetwork/index.html` in the browser to see the live build of `ml5.js` working in some example code.
34+
A webpage at http://localhost:8080/examples/ should automatically open with the directory listing of the example directory. Select one of the directories to test run `ml5.js` in some example code.

examples/NeuralNetwork/index.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<meta http-equiv="X-UA-Compatible" content="IE=edge" />
66
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
77
<title>Document</title>
8-
<script src="http://localhost:8080/ml5.js"></script>
8+
<script src="../../dist/ml5.js"></script>
99
</head>
1010
<body>
1111
<script src="script.js"></script>

webpack.config.js

Lines changed: 14 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ module.exports = function (env, argv) {
1111
output: {
1212
filename: "ml5.js",
1313
path: resolve(__dirname, "dist"),
14-
publicPath: "/",
14+
publicPath: "/dist/",
1515
library: {
1616
name: "ml5",
1717
type: "umd",
@@ -21,10 +21,19 @@ module.exports = function (env, argv) {
2121
devServer: {
2222
port: 8080,
2323
allowedHosts: "all",
24-
static: {
25-
directory: resolve(__dirname, "dist"),
26-
watch: true,
27-
},
24+
static: [
25+
{
26+
directory: resolve(__dirname, "dist"),
27+
publicPath: "/dist",
28+
watch: true,
29+
},
30+
{
31+
directory: resolve(__dirname, "examples"),
32+
publicPath: "/examples",
33+
watch: true,
34+
},
35+
],
36+
open: "/examples",
2837
},
2938
plugins: [
3039
new HtmlWebpackPlugin({

0 commit comments

Comments
 (0)