Skip to content

Commit 9237fda

Browse files
committed
Remove copying scripts to minified/.. to npm build.
This otherwise leads to merge conflict to each PR. Also the js file in minified is supposed to be latest release instead of latest version of the development script (doesn't help anyone).
1 parent 5d10865 commit 9237fda

File tree

3 files changed

+4
-7
lines changed

3 files changed

+4
-7
lines changed

package.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,8 @@
2828
"build:umd_windows": ".\\scripts\\build-webpack.bat",
2929
"build:copy": "cp README.md dist && cp package.json dist && cp LICENSE dist",
3030
"build:copy_windows": "copy README.md dist && copy package.json dist && copy LICENSE dist",
31-
"release": "npm run build && cd dist && npm publish"
31+
"release": "npm run build && cp dist/html5-qrcode.min.js minified/html5-qrcode.min.js && cd dist && npm publish",
32+
"release_windows": "npm run build && cp dist\\html5-qrcode.min.js minified\\html5-qrcode.min.js && cd dist && npm publish"
3233
},
3334
"repository": {
3435
"type": "git",

scripts/build-webpack.bat

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,4 @@ call webpack
1010
:: make classes global to be backwards compatible.
1111
type scripts\webpack_append_data.min.js >> dist\html5-qrcode.min.js
1212

13-
copy dist\html5-qrcode.min.js minified\html5-qrcode.min.js
14-
15-
ECHO Copied the webpack script to minified/..
1613
ECHO Webpack building done.

scripts/build-webpack.sh

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,13 @@
22
## Build Script
33
echo 'Initiating webpack build sequence.'
44

5+
export NODE_OPTIONS=--openssl-legacy-provider
6+
57
webpack
68

79
## Script copied to dist/html5-qrcode.min.js
810
## Fork content of 'webpack_append_data.min.js' to final js file to
911
## make classes global to be backwards compatible.
1012
cat scripts/webpack_append_data.min.js >> dist/html5-qrcode.min.js
1113

12-
cp dist/html5-qrcode.min.js minified/html5-qrcode.min.js
13-
echo 'Copied the webpack script to minified/..'
14-
1514
echo 'Webpack building done.'

0 commit comments

Comments
 (0)