Skip to content

Commit a52692e

Browse files
authored
[core] fix: remove implicit dependency on colors package Sass (#4891)
1 parent 519228d commit a52692e

File tree

7 files changed

+10
-10
lines changed

7 files changed

+10
-10
lines changed

packages/colors/package.json

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,14 @@
11
{
22
"name": "@blueprintjs/colors",
33
"version": "1.0.1",
4-
"description": "Blueprint color definitions and utilities",
4+
"description": "Blueprint color definitions",
55
"main": "lib/index.js",
66
"scripts": {
77
"clean": "rm -rf lib/*",
88
"compile": "tsc -p src/",
9-
"lint": "run-p lint:scss lint:es",
9+
"lint": "run-p lint:es",
1010
"lint:es": "es-lint",
11-
"lint:scss": "sass-lint",
12-
"lint-fix": "es-lint --fix && sass-lint --fix",
11+
"lint-fix": "es-lint --fix",
1312
"test": "mocha test/index.js"
1413
},
1514
"devDependencies": {

packages/core/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
"dist": "run-s \"dist:*\"",
3333
"dist:bundle": "cross-env NODE_ENV=production webpack",
3434
"dist:css": "css-dist lib/css/*.css",
35-
"dist:variables": "generate-css-variables ../../colors/src/colors.scss common/_color-aliases.scss common/_variables.scss",
35+
"dist:variables": "generate-css-variables common/_colors.scss common/_color-aliases.scss common/_variables.scss",
3636
"dist:verify": "assert-package-layout",
3737
"lint": "run-p lint:scss lint:es",
3838
"lint:scss": "sass-lint",

packages/core/src/blueprint-hi-contrast.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ $pt-intent-danger: #c23030 !default; // $red2;
1515

1616
// Import files in the same order that they are documented in the docs
1717
@import "common/variables";
18-
@import "~@blueprintjs/colors/src/colors";
18+
@import "common/colors";
1919

2020
@import "reset";
2121
@import "typography";

packages/core/src/blueprint.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ Licensed under the Apache License, Version 2.0.
77

88
// Import files in the same order that they are documented in the docs
99
@import "common/variables";
10-
@import "~@blueprintjs/colors/src/colors";
10+
@import "common/colors";
1111

1212
@import "reset";
1313
@import "typography";

packages/colors/src/colors.scss renamed to packages/core/src/common/_colors.scss

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -114,3 +114,5 @@ $sepia2: #7d5125 !default;
114114
$sepia3: #96622d !default;
115115
$sepia4: #b07b46 !default;
116116
$sepia5: #c99765 !default;
117+
118+
@import "color-aliases";

packages/core/src/common/_mixins.scss

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
11
// Copyright 2015 Palantir Technologies, Inc. All rights reserved.
22
// Licensed under the Apache License, Version 2.0.
33

4-
@import "~@blueprintjs/colors/src/colors";
5-
@import "color-aliases";
4+
@import "colors";
65
@import "flex";
76

87
$pt-intent-colors: (

packages/core/src/common/_variables.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
// Copyright 2015 Palantir Technologies, Inc. All rights reserved.
22
// Licensed under the Apache License, Version 2.0.
33

4-
@import "~@blueprintjs/colors/src/colors";
4+
@import "colors";
55
@import "color-aliases";
66
@import "mixins";
77

0 commit comments

Comments
 (0)