Gildas 3 лет назад
Родитель
Сommit
0cbc6e29ad
4 измененных файлов с 31 добавлено и 43 удалено
  1. 18 30
      package-lock.json
  2. 3 3
      package.json
  3. 5 5
      rollup.config.dev.js
  4. 5 5
      rollup.config.js

+ 18 - 30
package-lock.json

@@ -1,16 +1,16 @@
 {
 	"name": "single-file",
-	"version": "1.0.8",
+	"version": "1.0.10",
 	"lockfileVersion": 2,
 	"requires": true,
 	"packages": {
 		"": {
 			"name": "single-file",
-			"version": "1.0.8",
+			"version": "1.0.10",
 			"license": "AGPL-3.0-or-later",
 			"dependencies": {
-				"single-file-cli": "1.0.11",
-				"single-file-core": "1.0.15"
+				"single-file-cli": "1.0.12",
+				"single-file-core": "1.0.16"
 			},
 			"bin": {
 				"single-file": "cli/single-file"
@@ -1523,16 +1523,16 @@
 			"integrity": "sha512-MATJdZp8sLqDl/68LfQmbP8zKPLQNV6BIZoIgrscFDQ+RsvK/BxeDQOgyxKKoh0y/8h3BqVFnCqQ/gd+reiIXA=="
 		},
 		"node_modules/single-file-cli": {
-			"version": "1.0.11",
-			"resolved": "https://registry.npmjs.org/single-file-cli/-/single-file-cli-1.0.11.tgz",
-			"integrity": "sha512-qRwV/sLIUbPdZusFLclCVJaO0zV5TyVuFH7KM9/8/hsC+RQpHJbpIc5n8zV9Az2Icko1svCWZsB4Cvpioz71DA==",
+			"version": "1.0.12",
+			"resolved": "https://registry.npmjs.org/single-file-cli/-/single-file-cli-1.0.12.tgz",
+			"integrity": "sha512-fray0V60B7zgrWilQUKeLLGBtTEhP16TMTKxnhef2SzRq5rb0xv2ijQBk5kMFFtYXSjUYa/VuE7+jNHleyz0Qg==",
 			"dependencies": {
 				"file-url": "3.0.0",
 				"iconv-lite": "0.6.3",
 				"jsdom": "19.0.0",
 				"puppeteer-core": "14.2.1",
 				"selenium-webdriver": "4.2.0",
-				"single-file-core": "1.0.14",
+				"single-file-core": "1.0.16",
 				"strong-data-uri": "1.0.6",
 				"yargs": "17.5.1"
 			},
@@ -1540,15 +1540,10 @@
 				"single-file": "single-file"
 			}
 		},
-		"node_modules/single-file-cli/node_modules/single-file-core": {
-			"version": "1.0.14",
-			"resolved": "https://registry.npmjs.org/single-file-core/-/single-file-core-1.0.14.tgz",
-			"integrity": "sha512-k5L4qTnizzE+5ur4NL7J1mXRdGk7WH2QU9WOkqZEO525YE9dZdtq+YYSMNRrJJTj39ccGE4ckcYtGFvF1Si6Ig=="
-		},
 		"node_modules/single-file-core": {
-			"version": "1.0.15",
-			"resolved": "https://registry.npmjs.org/single-file-core/-/single-file-core-1.0.15.tgz",
-			"integrity": "sha512-En7VzMooNf+ViLMra1fEdvDYPsMGUqz/B5S8Jkc8UL1zaxhnTg1JY79rthpAOgiqUsJSX3KAMJBS0dOAsS5iaA=="
+			"version": "1.0.16",
+			"resolved": "https://registry.npmjs.org/single-file-core/-/single-file-core-1.0.16.tgz",
+			"integrity": "sha512-7FnH0c3OtgbxvEsn1iBkVVS0DdE0sgm4n+BrHy3pC0lCVtNZMCQ1kDmSudWUeHoFKr4bP9wAPUqM8DEY2kS75w=="
 		},
 		"node_modules/source-map": {
 			"version": "0.6.1",
@@ -3113,31 +3108,24 @@
 			"integrity": "sha512-MATJdZp8sLqDl/68LfQmbP8zKPLQNV6BIZoIgrscFDQ+RsvK/BxeDQOgyxKKoh0y/8h3BqVFnCqQ/gd+reiIXA=="
 		},
 		"single-file-cli": {
-			"version": "1.0.11",
-			"resolved": "https://registry.npmjs.org/single-file-cli/-/single-file-cli-1.0.11.tgz",
-			"integrity": "sha512-qRwV/sLIUbPdZusFLclCVJaO0zV5TyVuFH7KM9/8/hsC+RQpHJbpIc5n8zV9Az2Icko1svCWZsB4Cvpioz71DA==",
+			"version": "1.0.12",
+			"resolved": "https://registry.npmjs.org/single-file-cli/-/single-file-cli-1.0.12.tgz",
+			"integrity": "sha512-fray0V60B7zgrWilQUKeLLGBtTEhP16TMTKxnhef2SzRq5rb0xv2ijQBk5kMFFtYXSjUYa/VuE7+jNHleyz0Qg==",
 			"requires": {
 				"file-url": "3.0.0",
 				"iconv-lite": "0.6.3",
 				"jsdom": "19.0.0",
 				"puppeteer-core": "14.2.1",
 				"selenium-webdriver": "4.2.0",
-				"single-file-core": "1.0.14",
+				"single-file-core": "1.0.16",
 				"strong-data-uri": "1.0.6",
 				"yargs": "17.5.1"
-			},
-			"dependencies": {
-				"single-file-core": {
-					"version": "1.0.14",
-					"resolved": "https://registry.npmjs.org/single-file-core/-/single-file-core-1.0.14.tgz",
-					"integrity": "sha512-k5L4qTnizzE+5ur4NL7J1mXRdGk7WH2QU9WOkqZEO525YE9dZdtq+YYSMNRrJJTj39ccGE4ckcYtGFvF1Si6Ig=="
-				}
 			}
 		},
 		"single-file-core": {
-			"version": "1.0.15",
-			"resolved": "https://registry.npmjs.org/single-file-core/-/single-file-core-1.0.15.tgz",
-			"integrity": "sha512-En7VzMooNf+ViLMra1fEdvDYPsMGUqz/B5S8Jkc8UL1zaxhnTg1JY79rthpAOgiqUsJSX3KAMJBS0dOAsS5iaA=="
+			"version": "1.0.16",
+			"resolved": "https://registry.npmjs.org/single-file-core/-/single-file-core-1.0.16.tgz",
+			"integrity": "sha512-7FnH0c3OtgbxvEsn1iBkVVS0DdE0sgm4n+BrHy3pC0lCVtNZMCQ1kDmSudWUeHoFKr4bP9wAPUqM8DEY2kS75w=="
 		},
 		"source-map": {
 			"version": "0.6.1",

+ 3 - 3
package.json

@@ -1,6 +1,6 @@
 {
 	"name": "single-file",
-	"version": "1.0.9",
+	"version": "1.0.10",
 	"description": "SingleFile",
 	"author": "Gildas Lormeau",
 	"license": "AGPL-3.0-or-later",
@@ -12,8 +12,8 @@
 		"single-file": "./cli/single-file"
 	},
 	"dependencies": {
-		"single-file-core": "1.0.15",
-		"single-file-cli": "1.0.11"
+		"single-file-core": "1.0.16",
+		"single-file-cli": "1.0.12"
 	},
 	"devDependencies": {
 		"@rollup/plugin-node-resolve": "13.3.0",

+ 5 - 5
rollup.config.dev.js

@@ -5,7 +5,7 @@ const PLUGINS = [resolve({ moduleDirectories: [".."] })];
 const EXTERNAL = ["single-file-core"];
 
 export default [{
-	input: ["single-file-core/index.js"],
+	input: ["single-file-core/single-file.js"],
 	output: [{
 		file: "lib/single-file.js",
 		format: "umd",
@@ -15,7 +15,7 @@ export default [{
 	plugins: PLUGINS,
 	external: EXTERNAL
 }, {
-	input: ["single-file-core/processors/frame-tree/content/content-frame-tree.js"],
+	input: ["single-file-core/single-file-frames.js"],
 	output: [{
 		file: "lib/single-file-frames.js",
 		format: "umd",
@@ -35,7 +35,7 @@ export default [{
 	plugins: PLUGINS,
 	external: EXTERNAL
 }, {
-	input: ["single-file-core/processors/hooks/content/content-hooks-web.js"],
+	input: ["single-file-core/single-file-hooks.js"],
 	output: [{
 		file: "lib/single-file-hooks.js",
 		format: "iife",
@@ -44,7 +44,7 @@ export default [{
 	plugins: PLUGINS,
 	external: EXTERNAL
 }, {
-	input: ["single-file-core/processors/hooks/content/content-hooks-frames-web.js"],
+	input: ["single-file-core/single-file-hooks-frames.js"],
 	output: [{
 		file: "lib/single-file-hooks-frames.js",
 		format: "iife",
@@ -53,7 +53,7 @@ export default [{
 	plugins: PLUGINS,
 	external: EXTERNAL
 }, {
-	input: ["single-file-core/common/content-infobar-web.js"],
+	input: ["single-file-core/single-file-infobar.js"],
 	output: [{
 		file: "lib/single-file-infobar.js",
 		format: "iife",

+ 5 - 5
rollup.config.js

@@ -5,7 +5,7 @@ const PLUGINS = [resolve({ moduleDirectories: ["node_modules"] })];
 const EXTERNAL = ["single-file-core"];
 
 export default [{
-	input: ["single-file-core/index.js"],
+	input: ["single-file-core/single-file.js"],
 	output: [{
 		file: "lib/single-file.js",
 		format: "umd",
@@ -15,7 +15,7 @@ export default [{
 	plugins: PLUGINS,
 	external: EXTERNAL
 }, {
-	input: ["single-file-core/processors/frame-tree/content/content-frame-tree.js"],
+	input: ["single-file-core/single-file-frames.js"],
 	output: [{
 		file: "lib/single-file-frames.js",
 		format: "umd",
@@ -35,7 +35,7 @@ export default [{
 	plugins: PLUGINS,
 	external: EXTERNAL
 }, {
-	input: ["single-file-core/processors/hooks/content/content-hooks-web.js"],
+	input: ["single-file-core/single-file-hooks.js"],
 	output: [{
 		file: "lib/single-file-hooks.js",
 		format: "iife",
@@ -44,7 +44,7 @@ export default [{
 	plugins: PLUGINS,
 	external: EXTERNAL
 }, {
-	input: ["single-file-core/processors/hooks/content/content-hooks-frames-web.js"],
+	input: ["single-file-core/single-file-hooks-frames.js"],
 	output: [{
 		file: "lib/single-file-hooks-frames.js",
 		format: "iife",
@@ -53,7 +53,7 @@ export default [{
 	plugins: PLUGINS,
 	external: EXTERNAL
 }, {
-	input: ["single-file-core/common/content-infobar-web.js"],
+	input: ["single-file-core/single-file-infobar.js"],
 	output: [{
 		file: "lib/single-file-infobar.js",
 		format: "iife",