Skip to content

Commit dfc2b52

Browse files
committed
ci: remove reliance on inkscape binary
1 parent 1571e00 commit dfc2b52

File tree

7 files changed

+9
-45
lines changed

7 files changed

+9
-45
lines changed

.eslintrc.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ module.exports = {
77
],
88
parser: '@typescript-eslint/parser',
99
plugins: ['@typescript-eslint'],
10-
ignorePatterns: ['lib/', 'types/'],
10+
ignorePatterns: ['lib/', 'types/', '*.js'],
1111
rules: {
1212
'comma-dangle': ['error', 'never'],
1313
'no-eval': 'off',

.github/workflows/docs.yml

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -16,12 +16,6 @@ jobs:
1616

1717
steps:
1818
- uses: actions/checkout@v2
19-
- name: Install Latest Stable Inkscape
20-
run: |
21-
sudo add-apt-repository ppa:inkscape.dev/stable
22-
sudo apt update
23-
sudo apt install inkscape
24-
inkscape --version
2519
- name: Use Node.js ${{ matrix.node-version }}
2620
uses: actions/setup-node@v1
2721
with:

apps/discovery/package.json

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,7 @@
99
"publish": "expo publish",
1010
"test": "jest --watchAll",
1111
"test:ts": "tsc --noEmit",
12-
"test:lint": "eslint --ext ts,tsx src/",
13-
"postinstall": "cd ../.. && yarn install"
12+
"test:lint": "eslint --ext ts,tsx src/"
1413
},
1514
"jest": {
1615
"preset": "jest-expo"

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@
5050
"@svgr/webpack": "5.5.0",
5151
"@svgr/babel-preset": "5.5.0",
5252
"@svgr/core": "5.5.0",
53-
"@svgr/hast-util-to-babel-ast": "5.5.0",
53+
"@svgr/hast-util-to-babel-ast": "https://github.com/Droppers/hast-util-to-babel-ast.git",
5454
"@svgr/plugin-svgo": "5.5.0"
5555
},
5656
"workspaces": [

scripts/processSvgAssets.js

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
const fs = require('fs/promises');
22
const path = require('path');
33
const { extendDefaultPlugins, optimize } = require('svgo');
4-
const processSvgWithInkscape = require('./processSvgWithInkscape.js');
54

65
const sourceDir = 'assets/doc/svg';
76
const targetDemoDir = 'apps/discovery/assets/svg';
@@ -27,8 +26,7 @@ const configPluginsFirstPass = extendDefaultPlugins([
2726
async function optimizeSvgFile(assetName) {
2827
const sourceFile = path.join(sourceDir, assetName);
2928
const svg = await fs.readFile(sourceFile);
30-
const inkscapeSvg = await processSvgWithInkscape(svg);
31-
const resultPass1 = optimize(inkscapeSvg, {
29+
const resultPass1 = optimize(svg, {
3230
multipass: true,
3331
plugins: configPluginsFirstPass
3432
});

scripts/processSvgWithInkscape.js

Lines changed: 0 additions & 28 deletions
This file was deleted.

yarn.lock

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5096,12 +5096,13 @@ __metadata:
50965096
languageName: node
50975097
linkType: hard
50985098

5099-
"@svgr/hast-util-to-babel-ast@npm:5.5.0":
5099+
"@svgr/hast-util-to-babel-ast@https://github.com/Droppers/hast-util-to-babel-ast.git":
51005100
version: 5.5.0
5101-
resolution: "@svgr/hast-util-to-babel-ast@npm:5.5.0"
5101+
resolution: "@svgr/hast-util-to-babel-ast@https://github.com/Droppers/hast-util-to-babel-ast.git#commit=29729bd53973ea51eb86a8fcc1ddc1651ce51013"
51025102
dependencies:
51035103
"@babel/types": ^7.12.6
5104-
checksum: a03c1c7ab92b1a6dbd7671b0b78df4c07e8d808ff092671554a78752ec0c0425c03b6c82569a5f33903d191c73379eedf631f23aeb30b7a70185f5f2fc67fae6
5104+
entities: ^2.2.0
5105+
checksum: 34ae091ab7260208dec4ee13ce75517b9939b50b788dfd9801a2ed4c284f8d562da10c438bb2e6c12422b58199e78070d4e032013b6b6cc5315cf919aab3cab6
51055106
languageName: node
51065107
linkType: hard
51075108

@@ -10330,7 +10331,7 @@ __metadata:
1033010331
languageName: node
1033110332
linkType: hard
1033210333

10333-
"entities@npm:^2.0.0":
10334+
"entities@npm:^2.0.0, entities@npm:^2.2.0":
1033410335
version: 2.2.0
1033510336
resolution: "entities@npm:2.2.0"
1033610337
checksum: 19010dacaf0912c895ea262b4f6128574f9ccf8d4b3b65c7e8334ad0079b3706376360e28d8843ff50a78aabcb8f08f0a32dbfacdc77e47ed77ca08b713669b3

0 commit comments

Comments
 (0)