Upgrade 'std/esm' to 'esm', fixing the build issues on Node 10

(closes #5028, re: a065f2f2)

'std/esm' has been replaced with just 'esm'
This fixes the build for Node 10 and we can return to using
the current version now that we've dropped support for Node 4
This commit is contained in:
Bryan Housel
2018-05-11 09:41:26 -04:00
parent 0ba8aab93a
commit 82133d4577
5 changed files with 24 additions and 26 deletions

View File

@@ -1,5 +1,5 @@
/* eslint-disable no-console */
const requireESM = require('@std/esm')(module, { esm: 'js' });
const requireESM = require('esm')(module);
const _cloneDeep = requireESM('lodash-es/cloneDeep').default;
const _extend = requireESM('lodash-es/extend').default;
const _forEach = requireESM('lodash-es/forEach').default;

View File

@@ -1,6 +1,6 @@
/* Downloads the latest translations from Transifex */
const requireESM = require('@std/esm')(module, { esm: 'js' });
const requireESM = require('esm')(module);
const _isEmpty = requireESM('lodash-es/isEmpty').default;
const _merge = requireESM('lodash-es/merge').default;

View File

@@ -12,9 +12,9 @@ var buildSrc = require('./build_src')(isDevelopment);
var buildCSS = require('./build_css')(isDevelopment);
buildData()
.then(function () {
return buildSrc();
});
.then(function () {
return buildSrc();
});
buildCSS();

View File

@@ -40,7 +40,6 @@
},
"devDependencies": {
"@mapbox/maki": "^4.0.0",
"@std/esm": "0.22.0",
"chai": "^4.1.0",
"colors": "^1.1.2",
"concat-files": "^0.1.1",
@@ -48,6 +47,7 @@
"ecstatic": "^3.0.0",
"editor-layer-index": "osmlab/editor-layer-index.git#gh-pages",
"eslint": "^4.3.0",
"esm": "~3.0.0",
"gaze": "^1.1.1",
"glob": "^7.1.0",
"happen": "^0.3.1",
@@ -80,7 +80,6 @@
"greenkeeper": {
"label": "chore-greenkeeper",
"ignore": [
"@std/esm",
"d3"
]
},

View File

@@ -1,9 +1,6 @@
#!/usr/bin/env node
'use strict';
const requireESM = require('@std/esm')(module, { esm: 'js' });
const _merge = requireESM('lodash-es/merge').default;
const argv = require('minimist')(process.argv.slice(2));
if (argv.help || argv.h || !argv.svg) {
return help();
@@ -12,28 +9,30 @@ const fs = require('fs');
const json = (argv.json ? JSON.parse(fs.readFileSync(argv.json)) : {});
const xml2js = require('xml2js');
xmlToJs(argv.svg, function (err, obj) {
xmlToJs(argv.svg, function(err, obj) {
if (err) throw (err);
jsToXml(obj, function (err) {
if (err) console.log(err);
});
});
function xmlToJs(filename, cb) {
fs.readFile(filename, 'utf8', function (err, xmlStr) {
fs.readFile(filename, 'utf8', function(err, xmlStr) {
if (err) throw (err);
var opts = {
explicitArray: true,
explicitCharkey: true,
explicitChildren: true,
preserveChildrenOrder: true,
normalize: true,
attrkey: '#attr',
childkey: '#child',
charkey: '#char'
},
parser = new xml2js.Parser(opts);
const opts = {
explicitArray: true,
explicitCharkey: true,
explicitChildren: true,
preserveChildrenOrder: true,
normalize: true,
attrkey: '#attr',
childkey: '#child',
charkey: '#char'
};
const parser = new xml2js.Parser(opts);
parser.parseString(xmlStr, function (err, obj) {
cb(err, obj);
@@ -63,10 +62,10 @@ function transform(source) {
target['#char'] = source['#char'];
}
if (source['#attr'] !== undefined) {
var id = source['#attr'].id,
replace = (id && json[id] !== undefined) ? json[id] : {};
var id = source['#attr'].id;
var replace = (id && json[id] !== undefined) ? json[id] : {};
target['#attr'] = _merge(source['#attr'], replace);
target['#attr'] = Object.assign(source['#attr'], replace);
if (replace.viewBox !== undefined) {
target['#name'] = 'symbol';
}