diff --git a/README.md b/README.md index b550b591..04f19385 100644 --- a/README.md +++ b/README.md @@ -32,12 +32,6 @@ yarn add @extractus/article-extractor ```ts // es6 module import { extract } from '@extractus/article-extractor' - -// CommonJS -const { extract } = require('@extractus/article-extractor') - -// or specify exactly path to CommonJS variant -const { extract } = require('@extractus/article-extractor/dist/cjs/article-extractor.js') ``` ### Deno @@ -53,7 +47,7 @@ import { extract } from 'npm:@extractus/article-extractor' ### Browser ```ts -import { read } from 'https://unpkg.com/@extractus/article-extractor@latest/dist/article-extractor.esm.js' +import { extract } from '@extractus/article-extractor' ``` Please check [the examples](examples) for reference. @@ -498,8 +492,8 @@ Read [sanitize-html](https://github.com/apostrophecms/sanitize-html#default-opti ```bash git clone https://github.com/extractus/article-extractor.git cd article-extractor -npm i -npm test +pnpm i +pnpm test ``` ![article-extractor-test.png](https://i.imgur.com/TbRCUSS.png?110222) @@ -510,8 +504,8 @@ npm test ```bash git clone https://github.com/extractus/article-extractor.git cd article-extractor -npm i -npm run eval {URL_TO_PARSE_ARTICLE} +pnpm i +pnpm eval {URL_TO_PARSE_ARTICLE} ``` ## License diff --git a/deno.json b/deno.json new file mode 100644 index 00000000..69c86e25 --- /dev/null +++ b/deno.json @@ -0,0 +1,9 @@ +{ + "imports": { + "cross-fetch": "./src/deno/cross-fetch.js", + "linkedom": "https://deno.land/x/deno_dom@v0.1.38/deno-dom-wasm.ts", + "@mozilla/readability": "https://esm.sh/@mozilla/readability@0.4.4", + "sanitize-html": "https://esm.sh/sanitize-html@2.11.0", + "bellajs": "https://esm.sh/bellajs@11.1.2" + } +} diff --git a/eval.js b/eval.js index 77a2c1fe..829f9b63 100644 --- a/eval.js +++ b/eval.js @@ -1,7 +1,7 @@ // eval.js -import { execSync } from 'child_process' -import { readFileSync, writeFileSync, existsSync } from 'fs' +import { execSync } from 'node:child_process' +import { readFileSync, writeFileSync, existsSync } from 'node:fs' import { slugify } from 'bellajs' diff --git a/package.json b/package.json index 87442e07..fb61a75e 100644 --- a/package.json +++ b/package.json @@ -1,5 +1,5 @@ { - "version": "7.3.0", + "version": "8.0.0", "name": "@extractus/article-extractor", "description": "To extract main article from given URL", "homepage": "https://github.com/extractus/article-extractor", @@ -10,7 +10,15 @@ "author": "@extractus", "main": "./src/main.js", "type": "module", + "imports": { + "cross-fetch": "./src/deno/cross-fetch.js", + "linkedom": "https://deno.land/x/deno_dom@v0.1.38/deno-dom-wasm.ts", + "@mozilla/readability": "https://esm.sh/@mozilla/readability@0.4.4", + "sanitize-html": "https://esm.sh/sanitize-html@2.11.0", + "bellajs": "https://esm.sh/bellajs@11.1.2" + }, "browser": { + "cross-fetch": "./src/deno/cross-fetch.js", "linkedom": "./src/browser/linkedom.js" }, "types": "./index.d.ts", @@ -35,8 +43,8 @@ "devDependencies": { "@types/sanitize-html": "^2.9.0", "eslint": "^8.44.0", - "https-proxy-agent": "^7.0.0", - "jest": "^29.6.0", + "https-proxy-agent": "^7.0.1", + "jest": "^29.6.1", "nock": "^13.3.1" }, "keywords": [ diff --git a/reset.js b/reset.js index 0d7b9da3..6afa5a09 100644 --- a/reset.js +++ b/reset.js @@ -3,9 +3,9 @@ import { existsSync, unlinkSync -} from 'fs' +} from 'node:fs' -import { execSync } from 'child_process' +import { execSync } from 'node:child_process' const dirs = [ 'evaluation', diff --git a/src/utils/extractMetaData.test.js b/src/utils/extractMetaData.test.js index 20cefab2..fc47307b 100644 --- a/src/utils/extractMetaData.test.js +++ b/src/utils/extractMetaData.test.js @@ -1,7 +1,7 @@ // extractMetaData.test /* eslint-env jest */ -import { readFileSync } from 'fs' +import { readFileSync } from 'node:fs' import { isObject, hasProperty } from 'bellajs' diff --git a/src/utils/extractWithReadability.test.js b/src/utils/extractWithReadability.test.js index b85e463c..db603d42 100644 --- a/src/utils/extractWithReadability.test.js +++ b/src/utils/extractWithReadability.test.js @@ -1,7 +1,7 @@ // extractWithReadability.test /* eslint-env jest */ -import { readFileSync } from 'fs' +import { readFileSync } from 'node:fs' import { isString } from 'bellajs' diff --git a/src/utils/html.test.js b/src/utils/html.test.js index e3048035..1c4d91e7 100644 --- a/src/utils/html.test.js +++ b/src/utils/html.test.js @@ -1,7 +1,7 @@ // html.test /* eslint-env jest */ -import { readFileSync } from 'fs' +import { readFileSync } from 'node:fs' import { isString } from 'bellajs' diff --git a/src/utils/linker.test.js b/src/utils/linker.test.js index 892fa567..42991203 100644 --- a/src/utils/linker.test.js +++ b/src/utils/linker.test.js @@ -1,7 +1,7 @@ // linker.test /* eslint-env jest */ -import { readFileSync } from 'fs' +import { readFileSync } from 'node:fs' import { isString } from 'bellajs' diff --git a/src/utils/parseFromHtml.test.js b/src/utils/parseFromHtml.test.js index bcd70c8b..459042b3 100644 --- a/src/utils/parseFromHtml.test.js +++ b/src/utils/parseFromHtml.test.js @@ -1,7 +1,7 @@ // parseFromHtml.test /* eslint-env jest */ -import { readFileSync } from 'fs' +import { readFileSync } from 'node:fs' import { isFunction } from 'bellajs'