You signed in with another tab or window. Reload to refresh your session.You signed out in another tab or window. Reload to refresh your session.You switched accounts on another tab or window. Reload to refresh your session.Dismiss alert
@@ -359,41 +355,24 @@ <h3 id="step-1-include-the-sdk">Step 1: Include the SDK</h3>
359
355
<ul>
360
356
<li>jsDelivr</li>
361
357
</ul>
362
-
<<<<<<<HEAD
363
-
<pre><codeclass="hljs html language-html"><spanclass="hljs-tag"><<spanclass="hljs-name">script</span><spanclass="hljs-attr">src</span>=<spanclass="hljs-string">"https://cdn.jsdelivr.net/npm/dynamsoft-barcode-reader-bundle@11.4.2001/dist/dbr.bundle.js"</span>></span><spanclass="hljs-tag"></<spanclass="hljs-name">script</span>></span>
364
-
=======
365
358
<pre><codeclass="hljs html language-html"><spanclass="hljs-tag"><<spanclass="hljs-name">script</span><spanclass="hljs-attr">src</span>=<spanclass="hljs-string">"https://cdn.jsdelivr.net/npm/dynamsoft-barcode-reader-bundle@11.4.3000/dist/dbr.bundle.js"</span>></span><spanclass="hljs-tag"></<spanclass="hljs-name">script</span>></span>
366
-
>>>>>>> _dev
367
359
</code></pre>
368
360
<ul>
369
361
<li>UNPKG</li>
370
362
</ul>
371
-
<<<<<<<HEAD
372
-
<pre><codeclass="hljs html language-html"><spanclass="hljs-tag"><<spanclass="hljs-name">script</span><spanclass="hljs-attr">src</span>=<spanclass="hljs-string">"https://unpkg.com/dynamsoft-barcode-reader-bundle@11.4.2001/dist/dbr.bundle.js"</span>></span><spanclass="hljs-tag"></<spanclass="hljs-name">script</span>></span>
373
-
</code></pre>
374
-
<!-- - In some rare cases (such as some restricted areas), you might not be able to access the CDN. If this happens, you can use the following files for the test.
<pre><codeclass="hljs html language-html"><spanclass="hljs-tag"><<spanclass="hljs-name">script</span><spanclass="hljs-attr">src</span>=<spanclass="hljs-string">"https://unpkg.com/dynamsoft-barcode-reader-bundle@11.4.3000/dist/dbr.bundle.js"</span>></span><spanclass="hljs-tag"></<spanclass="hljs-name">script</span>></span>
378
364
</code></pre>
379
365
<!-- - In some rare cases (such as some restricted areas), you might not be able to access the CDN. If this happens, you can use the following files for the test.
However, please **DO NOT** use `download2.dynamsoft.com` resources in a production application as they are for temporary testing purposes only. Instead, you can try hosting the SDK yourself. -->
385
370
<ul>
386
371
<li>In frameworks like React, Vue and Angular, you may want to add the package as a dependency.</li>
387
372
</ul>
388
-
<<<<<<<HEAD
389
-
<pre><codeclass="hljs sh language-sh"> npm i dynamsoft-barcode-reader-bundle@11.4.2001 -E
<p>NOTE that in frameworks, you need to <ahref="#2-optional-specify-the-location-of-the-engine-files">specify the location of the engine files</a>.</p>
399
378
<divclass="multi-panel-end"></div>
@@ -406,22 +385,14 @@ <h3 id="step-1-include-the-sdk">Step 1: Include the SDK</h3>
406
385
<p>The resources are located at path <code>dynamsoft-barcode-reader-js-{version-number}/dist/</code>.</p></li>
407
386
<li><p>From npm</p></li>
408
387
</ul>
409
-
<<<<<<<HEAD
410
-
<pre><codeclass="hljs sh language-sh"> npm i dynamsoft-barcode-reader-bundle@11.4.2001 -E
411
-
=======
412
388
<pre><codeclass="hljs sh language-sh"> npm i dynamsoft-barcode-reader-bundle@11.4.3000 -E
413
-
>>>>>>> _dev
414
389
</code></pre>
415
390
<p>The resources are located at the path <code>node_modules/<pkg></code>, without <code>@<version></code>. You must copy "dynamsoft-xxx" packages elsewhere and add <code>@<version></code>. The <code><version></code> can be obtained from <code>package.json</code> of each package. Another thing to do is to <ahref="#2-optional-specify-the-location-of-the-engine-files">specify the engineResourcePaths</a> so that the SDK can correctly locate the resources.</p>
416
391
<blockquote>
417
392
<p>Since "node<em>modules" is reserved for Node.js dependencies, and in our case the package is used only as static resources, we recommend either renaming the "node</em>modules" folder or moving the "dynamsoft-" packages to a dedicated folder for static resources in your project to facilitate self-hosting.</p>
418
393
</blockquote>
419
394
<p>You can typically include SDK like this:</p>
420
-
<<<<<<<HEAD
421
-
<pre><codeclass="hljs html language-html"><spanclass="hljs-tag"><<spanclass="hljs-name">script</span><spanclass="hljs-attr">src</span>=<spanclass="hljs-string">"path/to/dynamsoft-barcode-reader-bundle@11.4.2001/dist/dbr.bundle.js"</span>></span><spanclass="hljs-tag"></<spanclass="hljs-name">script</span>></span>
422
-
=======
423
395
<pre><codeclass="hljs html language-html"><spanclass="hljs-tag"><<spanclass="hljs-name">script</span><spanclass="hljs-attr">src</span>=<spanclass="hljs-string">"path/to/dynamsoft-barcode-reader-bundle@11.4.3000/dist/dbr.bundle.js"</span>></span><spanclass="hljs-tag"></<spanclass="hljs-name">script</span>></span>
424
-
>>>>>>> _dev
425
396
</code></pre>
426
397
<divclass="multi-panel-end"></div>
427
398
<divclass="multi-panel-switching-end"></div>
@@ -687,11 +658,7 @@ <h4 id="14-specify-a-scan-region">1.4. Specify a scan region</h4>
687
658
<h3id="2-edit-the-preset-templates-directly">2. Edit the preset templates directly</h3>
688
659
<p>The preset templates have many more settings that can be customized to suit your use case best. If you <ahref="https://www.dynamsoft.com/barcode-reader/downloads/1000003-confirmation/">download the SDK from Dynamsoft website</a>, you can find the templates under</p>
<!-- - In some rare cases (such as some restricted areas), you might not be able to access the CDN. If this happens, you can use the following files for the test.
However, please **DO NOT** use `download2.dynamsoft.com` resources in a production application as they are for temporary testing purposes only. Instead, you can try hosting the SDK yourself. -->
191
175
192
176
- In frameworks like React, Vue and Angular, you may want to add the package as a dependency.
193
177
194
178
```sh
195
-
<<<<<<< HEAD
196
-
npm i dynamsoft-barcode-reader-bundle@11.4.2001 -E
NOTE that in frameworks, you need to [specify the location of the engine files](#2-optional-specify-the-location-of-the-engine-files).
@@ -220,11 +198,7 @@ Besides using the public CDN, you can also download the SDK and host its files o
220
198
- From npm
221
199
222
200
```sh
223
-
<<<<<<< HEAD
224
-
npm i dynamsoft-barcode-reader-bundle@11.4.2001 -E
225
-
=======
226
201
npm i dynamsoft-barcode-reader-bundle@11.4.3000 -E
227
-
>>>>>>> _dev
228
202
```
229
203
230
204
The resources are located at the path `node_modules/<pkg>`, without `@<version>`. You must copy "dynamsoft-xxx" packages elsewhere and add `@<version>`. The `<version>` can be obtained from `package.json` of each package. Another thing to do is to [specify the engineResourcePaths](#2-optional-specify-the-location-of-the-engine-files) so that the SDK can correctly locate the resources.
@@ -233,11 +207,7 @@ Besides using the public CDN, you can also download the SDK and host its files o
The preset templates have many more settings that can be customized to suit your use case best. If you [download the SDK from Dynamsoft website](https://www.dynamsoft.com/barcode-reader/downloads/1000003-confirmation/), you can find the templates under
Copy file name to clipboardExpand all lines: package.json
-17Lines changed: 0 additions & 17 deletions
Original file line number
Diff line number
Diff line change
@@ -1,10 +1,6 @@
1
1
{
2
2
"name": "dynamsoft-barcode-reader-bundle",
3
-
<<<<<<< HEAD
4
-
"version": "11.4.2001",
5
-
=======
6
3
"version": "11.4.3000",
7
-
>>>>>>> _dev
8
4
"description": "Dynamsoft Barcode Reader JS is a recognition SDK which enables you to embed barcode reading functionality in your web, desktop, and mobile applications. With a few lines of JavaScript code, you can develop a robust application to scan a linear barcode, QR Code, DaraMatrix, PDF417, and Aztec Code.",
0 commit comments