Skip to content

Commit 65a0cfa

Browse files
DFP Fix csslint ignore with prefixed .frappe missed code
1 parent 35d2441 commit 65a0cfa

File tree

2 files changed

+30
-0
lines changed

2 files changed

+30
-0
lines changed

rollup/config.js

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,8 @@ const { terser } = require('rollup-plugin-terser');
1212
const vue = require('rollup-plugin-vue');
1313
const frappe_html = require('./frappe-html-plugin');
1414
const less_loader = require('./less-loader');
15+
// DFP: Add rollup/json plugin to allow import .json files
16+
const json = require('@rollup/plugin-json');
1517

1618
const production = process.env.FRAPPE_ENV === 'production';
1719

@@ -51,6 +53,8 @@ function get_rollup_options_for_js(output_file, input_files) {
5153
ignore_css(),
5254
// .vue -> .js
5355
vue.default(),
56+
// DFP: Add rollup/json plugin to allow import .json files
57+
json(),
5458
// ES6 -> ES5
5559
buble({
5660
objectAssign: 'Object.assign',

yarn.lock

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,22 @@
4343
debug "^3.1.0"
4444
lodash.once "^4.1.1"
4545

46+
"@rollup/plugin-json@^4.0.2":
47+
version "4.1.0"
48+
resolved "https://registry.yarnpkg.com/@rollup/plugin-json/-/plugin-json-4.1.0.tgz#54e09867ae6963c593844d8bd7a9c718294496f3"
49+
integrity sha512-yfLbTdNS6amI/2OpmbiBoW12vngr5NW2jCJVZSBEz+H5KfUJZ2M7sDjk0U6GOOdCWFVScShte29o9NezJ53TPw==
50+
dependencies:
51+
"@rollup/pluginutils" "^3.0.8"
52+
53+
"@rollup/pluginutils@^3.0.8":
54+
version "3.1.0"
55+
resolved "https://registry.yarnpkg.com/@rollup/pluginutils/-/pluginutils-3.1.0.tgz#706b4524ee6dc8b103b3c995533e5ad680c02b9b"
56+
integrity sha512-GksZ6pr6TpIjHm8h9lSQ8pi8BE9VeubNT0OMJ3B5uZJ8pz73NPiqOtCog/x2/QzM1ENChPKxMDhiQuRHsqc+lg==
57+
dependencies:
58+
"@types/estree" "0.0.39"
59+
estree-walker "^1.0.1"
60+
picomatch "^2.2.2"
61+
4662
"@types/blob-util@1.3.3":
4763
version "1.3.3"
4864
resolved "https://registry.yarnpkg.com/@types/blob-util/-/blob-util-1.3.3.tgz#adba644ae34f88e1dd9a5864c66ad651caaf628a"
@@ -1498,6 +1514,11 @@ estree-walker@^0.6.0:
14981514
resolved "https://registry.yarnpkg.com/estree-walker/-/estree-walker-0.6.0.tgz#5d865327c44a618dde5699f763891ae31f257dae"
14991515
integrity sha512-peq1RfVAVzr3PU/jL31RaOjUKLoZJpObQWJJ+LgfcxDUifyLZ1RjPQZTl0pzj2uJ45b7A7XpyppXvxdEqzo4rw==
15001516

1517+
estree-walker@^1.0.1:
1518+
version "1.0.1"
1519+
resolved "https://registry.yarnpkg.com/estree-walker/-/estree-walker-1.0.1.tgz#31bc5d612c96b704106b477e6dd5d8aa138cb700"
1520+
integrity sha512-1fMXF3YP4pZZVozF8j/ZLfvnR8NSIljt56UhbZ5PeeDmmGHpgpdwQt7ITlGvYaQukCvuBRMLEiKiYC+oeIg4cg==
1521+
15011522
esutils@^2.0.2:
15021523
version "2.0.2"
15031524
resolved "https://registry.yarnpkg.com/esutils/-/esutils-2.0.2.tgz#0abf4f1caa5bcb1f7a9d8acc6dea4faaa04bac9b"
@@ -3525,6 +3546,11 @@ performance-now@^2.1.0:
35253546
resolved "https://registry.yarnpkg.com/performance-now/-/performance-now-2.1.0.tgz#6309f4e0e5fa913ec1c69307ae364b4b377c9e7b"
35263547
integrity sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns=
35273548

3549+
picomatch@^2.2.2:
3550+
version "2.2.3"
3551+
resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-2.2.3.tgz#465547f359ccc206d3c48e46a1bcb89bf7ee619d"
3552+
integrity sha512-KpELjfwcCDUb9PeigTs2mBJzXUPzAuP2oPcA989He8Rte0+YUAjw1JVedDhuTKPkHjSYzMN3npC9luThGYEKdg==
3553+
35283554
pify@^2.0.0, pify@^2.2.0:
35293555
version "2.3.0"
35303556
resolved "https://registry.yarnpkg.com/pify/-/pify-2.3.0.tgz#ed141a6ac043a849ea588498e7dca8b15330e90c"

0 commit comments

Comments
 (0)