Skip to content

Commit 6bc814b

Browse files
authored
Merge pull request #8 from st3phhays/dependabot
(#7) Upgrade choco-theme and scripts
2 parents 35a328a + 29d2afb commit 6bc814b

File tree

7 files changed

+1347
-1628
lines changed

7 files changed

+1347
-1628
lines changed

.yarn/releases/yarn-3.2.1.cjs

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

.yarn/releases/yarn-3.2.2.cjs

Lines changed: 783 additions & 0 deletions
Large diffs are not rendered by default.

.yarnrc.yml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1-
yarnPath: .yarn/releases/yarn-3.2.1.cjs
1+
checksumBehavior: update
2+
23
nodeLinker: node-modules
3-
checksumBehavior: "update"
4+
5+
yarnPath: .yarn/releases/yarn-3.2.2.cjs

gulpfile.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ const gulp = require('gulp'),
55
concat = require('gulp-concat'),
66
cleancss = require('gulp-clean-css'),
77
uglify = require('gulp-uglify-es').default,
8-
sass = require('gulp-sass')(require('node-sass')),
8+
sass = require('gulp-sass')(require('sass')),
99
clean = require('gulp-clean'),
1010
purgecss = require('gulp-purgecss'),
1111
rename = require('gulp-rename'),

package.json

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "copenhagen_theme",
3-
"packageManager": "[email protected].1",
3+
"packageManager": "[email protected].2",
44
"version": "1.0.0",
55
"repository": "[email protected]:zendesk/copenhagen_theme.git",
66
"dependencies": {
@@ -19,5 +19,10 @@
1919
},
2020
"scripts": {
2121
"build": "./bin/compile.rb && gulp"
22+
},
23+
"resolutions": {
24+
"glob-parent": "^6.0.2",
25+
"nth-check": "^2.1.1",
26+
"terser": "^5.14.2"
2227
}
2328
}

style.css

Lines changed: 5 additions & 5 deletions
Large diffs are not rendered by default.

0 commit comments

Comments
 (0)