Skip to content

Commit f783004

Browse files
authored
Make build scripts compatible with node 12 (#15479)
* Make build scripts compatible with node 12 "fs/promises" is not in node 12, use a more compatible way to import it. Also, lock major down versions of the image build dependencies to prevent future surprises. * add node_modules dependency
1 parent 9d07fac commit f783004

File tree

3 files changed

+6
-4
lines changed

3 files changed

+6
-4
lines changed

Makefile

+2-2
Original file line numberDiff line numberDiff line change
@@ -736,8 +736,8 @@ generate-gitignore:
736736
GO111MODULE=on $(GO) run build/generate-gitignores.go
737737

738738
.PHONY: generate-images
739-
generate-images:
740-
npm install --no-save --no-package-lock fabric imagemin-zopfli
739+
generate-images: | node_modules
740+
npm install --no-save --no-package-lock fabric@4 imagemin-zopfli@7
741741
node build/generate-images.js $(TAGS)
742742

743743
.PHONY: generate-manpage

build/generate-images.js

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
11
import imageminZopfli from 'imagemin-zopfli';
22
import {optimize, extendDefaultPlugins} from 'svgo';
33
import {fabric} from 'fabric';
4-
import {readFile, writeFile} from 'fs/promises';
4+
import fs from 'fs';
55
import {resolve, dirname} from 'path';
66
import {fileURLToPath} from 'url';
77

8+
const {readFile, writeFile} = fs.promises;
89
const __dirname = dirname(fileURLToPath(import.meta.url));
910
const logoFile = resolve(__dirname, '../assets/logo.svg');
1011

build/generate-svg.js

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
11
import fastGlob from 'fast-glob';
22
import {optimize, extendDefaultPlugins} from 'svgo';
33
import {resolve, parse, dirname} from 'path';
4-
import {readFile, writeFile, mkdir} from 'fs/promises';
4+
import fs from 'fs';
55
import {fileURLToPath} from 'url';
66

7+
const {readFile, writeFile, mkdir} = fs.promises;
78
const __dirname = dirname(fileURLToPath(import.meta.url));
89
const glob = (pattern) => fastGlob.sync(pattern, {cwd: resolve(__dirname), absolute: true});
910
const outputDir = resolve(__dirname, '../public/img/svg');

0 commit comments

Comments
 (0)