Skip to content

Commit

Permalink
Update to use node v10.13.0
Browse files Browse the repository at this point in the history
Update node-sass and fsevents to versions that have prebuild builds for
node v10 so we don't hav to compile ourselves

Fix issue in ToastManager.scss as a result of the updated version of
sass being stricter in how it handles custom properties.
  • Loading branch information
BPScott committed Nov 5, 2018
1 parent f6f8107 commit 25f10f9
Show file tree
Hide file tree
Showing 8 changed files with 42 additions and 244 deletions.
6 changes: 3 additions & 3 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ version: 2
jobs:
check:
docker:
- image: circleci/node:8.12.0
- image: circleci/node:10.13.0
steps:
- checkout
- restore_cache:
Expand All @@ -19,7 +19,7 @@ jobs:
- run: yarn run build-shrink-ray
percy:
docker:
- image: circleci/node:8.12.0-browsers
- image: circleci/node:10.13.0-browsers
steps:
- checkout
- restore_cache:
Expand All @@ -35,7 +35,7 @@ jobs:
- run: yarn start & sleep 20; yarn run test:percy
a11y:
docker:
- image: circleci/node:8.12.0-browsers
- image: circleci/node:10.13.0-browsers
steps:
- checkout
- restore_cache:
Expand Down
2 changes: 1 addition & 1 deletion .github/CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ Each contributor is required to [sign a CLA](https://cla.shopify.com/). This pro

### Contribution prerequisites

- You have Node installed at v8.12.0+ and Yarn at v1.10.1+
- You have Node installed at v10.13.0+ and Yarn at v1.10.1+

### Best practices

Expand Down
2 changes: 1 addition & 1 deletion .nvmrc
Original file line number Diff line number Diff line change
@@ -1 +1 @@
v8.12.0
v10.13.0
2 changes: 1 addition & 1 deletion UNRELEASED.md
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,7 @@ The autocomplete component is an input field that provides selectable suggestion
- Removed empty state from `ResourceList` if there are no items and `loading` is true
- Move to use sewing-kit for test running, updating to Jest 23 in the process. This gives us working sourcemaps for code coverage
- Improved accessibility testing checklist
- Updated development node environment to 8.12.0
- Updated development node environment to 10.13.0
- Added shopify/jest plugin to eslint config

#### Open development
Expand Down
2 changes: 1 addition & 1 deletion dev.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ name: polaris-react
up:
- node:
yarn: true
version: v8.12.0 # to be kept in sync with .nvmrc and .circleci/config.yml
version: v10.13.0 # to be kept in sync with .nvmrc and .circleci/config.yml
- git_hooks:
pre-commit: pre-commit

Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,7 @@
"image-webpack-loader": "^3.3.1",
"in-publish": "^2.0.0",
"isomorphic-fetch": "^2.2.1",
"node-sass": "^4.5.3",
"node-sass": "^4.9.3",
"npm-run-all": "^4.0.2",
"object-hash": "^1.3.0",
"pa11y": "^5.0.4",
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
:root {
--toast-translate-y-out: rem(150px);
// Sass does not allow arbitary Sass function calls in custom properties.
// They must be interpolated
// See https://github.com/sass/libsass/issues/2585
--toast-translate-y-out: #{rem(150px)};
--toast-translate-y-in: 0;
}

Expand Down
Loading

0 comments on commit 25f10f9

Please sign in to comment.