Skip to content

Commit 968ef68

Browse files
committed
Everything working great, except for es6 import statements. Only require works at the moment. I might try to use Webpack instead of Browserify to make es6 import statements work as well
1 parent 5170f3f commit 968ef68

File tree

7 files changed

+18
-210
lines changed

7 files changed

+18
-210
lines changed

.gitignore

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1 @@
1-
umd/
2-
lib/
1+
umd/

bin/cli.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#!/usr/bin/env node
22

3-
const languageEncoding = require("../src/index.js");
3+
const languageEncoding = require("../src/index-node.js");
44

55
const path = process.argv[2];
66

package.json

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,20 +2,21 @@
22
"name": "detect-file-encoding-and-language",
33
"version": "1.6.1",
44
"description": "An NPM package to detect the encoding and language of a file",
5-
"main": "src/server/index-node.js",
5+
"main": "src/index-node.js",
66
"scripts": {
7-
"regextest": "node ./src/testing/regexTester.test.js",
8-
"test": "node ./src/testing/index.test.js",
7+
"regextest": "node ./testing/regexTester.test.js",
8+
"test": "node ./testing/language-encoding.test.js",
99
"prepublishOnly": "npm test"
1010
},
11-
"browser": "umd/browser-bundle.js",
11+
"browser": "umd/language-encoding.min.js",
1212
"bin": {
13-
"dfeal": "bin/cli.js"
13+
"dfeal": "bin/cli.js",
14+
"language-encoding": "bin/cli.js"
1415
},
1516
"files": [
1617
"umd"
1718
],
18-
"unpkg": "umd/browser-bundle.js",
19+
"unpkg": "umd/language-encoding.min.js",
1920
"repository": {
2021
"type": "git",
2122
"url": "git+https://github.com/gignupg/Detect-File-Encoding-and-Language.git"

src/index-browser.js

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ const processContent = require('./components/processContent.js');
33

44
module.exports = (file, test) => {
55
return new Promise((resolve, reject) => {
6-
const input = {};
6+
const data = {};
77
const utfReader = new FileReader();
88

99
utfReader.onerror = (err) => {
@@ -13,18 +13,18 @@ module.exports = (file, test) => {
1313
utfReader.onload = () => {
1414
const utfContent = utfReader.result;
1515

16-
input.utf8 = checkUTF(utfContent);
16+
data.utf8 = checkUTF(utfContent);
1717

18-
if (utf8) {
19-
input.content = utfContent;
20-
resolve(processContent(input));
18+
if (data.utf8) {
19+
data.content = utfContent;
20+
resolve(processContent(data));
2121

2222
} else {
2323
const isoReader = new FileReader();
2424

2525
isoReader.onload = () => {
26-
input.content = isoReader.result;
27-
resolve(processContent(input));
26+
data.content = isoReader.result;
27+
resolve(processContent(data));
2828
};
2929

3030
isoReader.readAsText(file, "ISO-8859-1");

src/index.js

Lines changed: 0 additions & 192 deletions
This file was deleted.
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
const languageEncoding = require("../index-node.js");
1+
const languageEncoding = require("../src/index-node.js");
22
const fs = require('fs');
33

44
const folderPath = "/home/gignu/Documents/Subtitle Database/Language Folders/";
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
const languageEncoding = require("../index-node.js");
1+
const languageEncoding = require("../src/index-node.js");
22

33
const path = process.argv[2];
44

0 commit comments

Comments
 (0)