Skip to content
This repository was archived by the owner on May 11, 2018. It is now read-only.

Use external Electron to Chromium library #144

Merged
merged 7 commits into from
Jan 19, 2017
Merged
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
Replace manual electron-to-chromium list and function with external l…
…ibrary
Kilian committed Jan 18, 2017

Verified

This commit was signed with the committer’s verified signature.
vjik Sergei Predvoditelev
commit c6ebef444f2a455c13414aeb8c211ad24643eb69
10 changes: 0 additions & 10 deletions data/electron-to-chromium.js

This file was deleted.

3 changes: 2 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -46,7 +46,8 @@
"babel-plugin-transform-exponentiation-operator": "^6.8.0",
"babel-plugin-transform-regenerator": "^6.6.0",
"browserslist": "^1.4.0",
"invariant": "^2.2.2"
"invariant": "^2.2.2",
"electron-to-chromium": "^1.1.0"
},
"devDependencies": {
"babel-cli": "^6.11.4",
28 changes: 5 additions & 23 deletions src/index.js
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
import browserslist from "browserslist";

import builtInsList from "../data/built-ins.json";
import defaultInclude from "./default-includes";
import electronToChromium from "../data/electron-to-chromium";
import e2c from "electron-to-chromium";
import moduleTransformations from "./module-transformations";
import normalizeOptions from "./normalize-options.js";
import pluginList from "../data/plugins.json";
@@ -82,26 +81,6 @@ export const getCurrentNodeVersion = () => {
return parseFloat(process.versions.node);
};

export const electronVersionToChromeVersion = (semverVer) => {
semverVer = String(semverVer);

if (semverVer === "1") {
semverVer = "1.0";
}

const m = semverVer.match(/^(\d+\.\d+)/);
if (!m) {
throw new Error("Electron version must be a semver version");
}

const result = electronToChromium[m[1]];
if (!result) {
throw new Error(`Electron version ${m[1]} is either too old or too new`);
}

return result;
};

const _extends = Object.assign || function (target) {
for (let i = 1; i < arguments.length; i++) {
const source = arguments[i];
@@ -124,7 +103,10 @@ export const getTargets = (targets = {}) => {

// Rewrite Electron versions to their Chrome equivalents
if (targetOps.electron) {
targetOps.chrome = electronVersionToChromeVersion(targetOps.electron);
targetOps.chrome = parseInt(e2c.electronToChromium(targetOps.electron), 10);
// if (!targetOps.chrome) {
// throw new Error(`Electron version ${targetOps.electron} is either too old or too new`);
// }
delete targetOps.electron;
}