Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Updates #47

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
node_modules
images/webcam-easy-demo-ok.gif
images/webcam-easy-demo.gif
demo/pnpm-lock.yaml
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ You can easily add it as a module to your own app.

#### Use Git Clone
``` shell
git https://github.com/bensonruan/webcam-easy.git
git clone https://github.com/bensonruan/webcam-easy.git
```

#### OR Use NPM
Expand Down
6 changes: 3 additions & 3 deletions demo/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@
<link rel="stylesheet" href="https://stackpath.bootstrapcdn.com/bootstrap/4.3.1/css/bootstrap.min.css">
<link href="https://fonts.googleapis.com/icon?family=Material+Icons" rel="stylesheet">
<link rel='stylesheet' type='text/css' media='screen' href='style/webcam-demo.css'>
<script src="//code.jquery.com/jquery-3.3.1.min.js"></script>
<script src="../dist/webcam-easy.min.js"></script>
<script src="https://code.jquery.com/jquery-3.3.1.min.js"></script>
<script src="../dist/webcam-easy.min.js"></script>
</head>
<body>
<main id="webcam-app">
Expand Down Expand Up @@ -48,4 +48,4 @@
</main>
<script src='js/app.js'></script>
</body>
</html>
</html>
14 changes: 7 additions & 7 deletions demo/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -22,12 +22,12 @@
"author": "Benson Ruan",
"license": "MIT",
"devDependencies": {
"@babel/core": "^7.4.3",
"babel-loader": "^8.0.5",
"@babel/polyfill": "^7.4.3",
"@babel/preset-env": "^7.4.3",
"webpack": "^4.16.1",
"webpack-cli": "^3.0.8",
"webpack-dev-server": "^3.1.10"
"@babel/core": "^7.19.6",
"@babel/polyfill": "^7.12.1",
"@babel/preset-env": "^7.19.4",
"babel-loader": "^8.2.5",
"webpack": "^5.74.0",
"webpack-cli": "^4.10.0",
"webpack-dev-server": "^4.11.1"
}
}
4 changes: 2 additions & 2 deletions demo/webpack.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,10 @@ module.exports = {
test: /\.js?$/,
exclude: /node_modules/,
loader: 'babel-loader',
query: {
options: {
presets: ['@babel/preset-env']
}
}
]
}
}
}