ryan/squoosh
1
0
Fork 0
forked from external-repos/squoosh
Code Pull Requests Activity

Moar prettier

Browse Source
This commit is contained in:
Surma
2020-09-09 18:25:32 +01:00
parent 31118daa18
commit 6e3e6af70e
5 changed files with 40 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
cli/lib/asset-plugin.js
View File

@@ -10,11 +10,11 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
import { promises as fs } from 'fs'; import { promises as fs } from "fs";
import { basename } from 'path'; import { basename } from "path";
const defaultOpts = { const defaultOpts = {
prefix: 'asset-url', prefix: "asset-url"
}; };
export default function assetPlugin(opts) { export default function assetPlugin(opts) {
@@ -23,9 +23,9 @@ export default function assetPlugin(opts) {
/** @type {Map<string, Buffer>} */ /** @type {Map<string, Buffer>} */
let assetIdToSourceBuffer; let assetIdToSourceBuffer;
const prefix = opts.prefix + ':'; const prefix = opts.prefix + ":";
return { return {
name: 'asset-plugin', name: "asset-plugin",
buildStart() { buildStart() {
assetIdToSourceBuffer = new Map(); assetIdToSourceBuffer = new Map();
}, },
@@ -56,20 +56,20 @@ export default function assetPlugin(opts) {
throw Error(`Cannot find ${realId}`); throw Error(`Cannot find ${realId}`);
} }
// Add an additional .js to the end so it ends up with .js at the end in the _virtual folder. // Add an additional .js to the end so it ends up with .js at the end in the _virtual folder.
return prefix + resolveResult.id + '.js'; return prefix + resolveResult.id + ".js";
}, },
async load(id) { async load(id) {
if (!id.startsWith(prefix)) return; if (!id.startsWith(prefix)) return;
const realId = id.slice(prefix.length, -'.js'.length); const realId = id.slice(prefix.length, -".js".length);
const source = await fs.readFile(realId); const source = await fs.readFile(realId);
assetIdToSourceBuffer.set(id, source); assetIdToSourceBuffer.set(id, source);
this.addWatchFile(realId); this.addWatchFile(realId);
return `export default import.meta.ROLLUP_FILE_URL_${this.emitFile({ return `export default import.meta.ROLLUP_FILE_URL_${this.emitFile({
type: 'asset', type: "asset",
source, source,
name: basename(realId), name: basename(realId)
})}`; })}`;
}, }
}; };
} }

4
cli/lib/json-plugin.js
View File

@@ -25,9 +25,9 @@ export default function ejsAssetPlugin() {
for (const [key, value] of Object.entries(JSON.parse(source))) { for (const [key, value] of Object.entries(JSON.parse(source))) {
code += ` code += `
export const ${key} = ${JSON.stringify(value)}; export const ${key} = ${JSON.stringify(value)};
` `;
} }
return code; return code;
}, }
}; };
} }

2
cli/src/codecs.js
View File

@@ -26,7 +26,7 @@ function instantiateEmscriptenWasm(factory, path) {
locateFile() { locateFile() {
return path; return path;
} }
}) });
} }
export default { export default {

2
cli/src/image_data.js
View File

@@ -4,4 +4,4 @@ export default class ImageData {
this.width = width; this.width = width;
this.height = height; this.height = height;
} }
}; }

11
cli/src/index.js
View File

@@ -1,10 +1,6 @@
import { program } from "commander"; import { program } from "commander";
import JSON5 from "json5"; import JSON5 from "json5";
import { import { Worker, isMainThread, parentPort } from "worker_threads";
Worker,
isMainThread,
parentPort
} from "worker_threads";
import { cpus } from "os"; import { cpus } from "os";
import { extname, join, basename } from "path"; import { extname, join, basename } from "path";
import { promises as fsp } from "fs"; import { promises as fsp } from "fs";
@@ -131,10 +127,7 @@ async function processFiles(files) {
value.defaultEncoderOptions, value.defaultEncoderOptions,
JSON5.parse(program[encName]) JSON5.parse(program[encName])
); );
const outputFile = join( const outputFile = join(program.outputDir, `${base}.${value.extension}`);
program.outputDir,
`${base}.${value.extension}`
);
jobs.push( jobs.push(
jobPromise(pool[i], { jobPromise(pool[i], {
bitmap, bitmap,