Skip to content

Commit 3eaf2f5

Browse files
authored
Source normalize.css from npm instead of bower (#2238)
This also upgrades us from 4.1.1 -> 8.0.1. Diffing these two versions makes it look like the changes are not trivial but a visual inspection turns up no obvious visual regressions. Partially Fixes: #1442
1 parent 68d177b commit 3eaf2f5

File tree

4 files changed

+9
-4
lines changed

4 files changed

+9
-4
lines changed

bower.json

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111
"dependencies": {
1212
"bootstrap": "^3.3.6",
1313
"lodash": "^4.11.2",
14-
"mustache.js": "mustache#^2.2.1",
15-
"normalize-css": "normalize.css#^4.1.1"
14+
"mustache.js": "mustache#^2.2.1"
1615
}
1716
}

gulpfile.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ const codemirrorStylesheets = [
2929
'node_modules/codemirror/addon/lint/lint.css',
3030
];
3131
const staticDir = path.join(srcDir, 'static');
32-
const bowerComponents = 'bower_components';
32+
const normalizeCssDir = 'node_modules/normalize.css';
3333

3434
const postcssBrowsers = [];
3535
const supportedBrowsers = JSON.parse(
@@ -62,7 +62,7 @@ gulp.task('css', () => {
6262

6363
return gulp
6464
.src([
65-
path.join(bowerComponents, 'normalize-css/normalize.css'),
65+
path.join(normalizeCssDir, 'normalize.css'),
6666
path.join(highlightStylesheetsDir, 'github.css'),
6767
...codemirrorStylesheets,
6868
path.join(stylesheetsDir, '**/*.css'),

package.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -250,6 +250,7 @@
250250
"mixpanel-browser": "2.35.0",
251251
"moment": "2.24.0",
252252
"mousetrap": "1.6.5",
253+
"normalize.css": "8.0.1",
253254
"object-inspect": "1.7.0",
254255
"offline-plugin": "5.0.7",
255256
"p5": "1.0.0",

yarn.lock

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9775,6 +9775,11 @@ normalize-url@^3.0.0:
97759775
resolved "https://registry.yarnpkg.com/normalize-url/-/normalize-url-3.3.0.tgz#b2e1c4dc4f7c6d57743df733a4f5978d18650559"
97769776
integrity sha512-U+JJi7duF1o+u2pynbp2zXDW2/PADgC30f0GsHZtRh+HOcXHnw137TrNlyxxRvWW5fjKd3bcLHPxofWuCjaeZg==
97779777

9778+
normalize.css@8.0.1:
9779+
version "8.0.1"
9780+
resolved "https://registry.yarnpkg.com/normalize.css/-/normalize.css-8.0.1.tgz#9b98a208738b9cc2634caacbc42d131c97487bf3"
9781+
integrity sha512-qizSNPO93t1YUuUhP22btGOo3chcvDFqFaj2TRybP0DMxkHOCTYwp3n34fel4a31ORXy4m1Xq0Gyqpb5m33qIg==
9782+
97789783
now-and-later@^2.0.0:
97799784
version "2.0.1"
97809785
resolved "https://registry.yarnpkg.com/now-and-later/-/now-and-later-2.0.1.tgz#8e579c8685764a7cc02cb680380e94f43ccb1f7c"

0 commit comments

Comments
 (0)