Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Bump ember-cli-sass to 10 #829

Merged
merged 4 commits into from
Aug 7, 2020
Merged

Bump ember-cli-sass to 10 #829

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
3fcc61b
Bump `ember-cli-sass` to `10`
twokul Aug 7, 2020
196f68f
Update `@addepar/style-box`
twokul Aug 7, 2020
8cb54b7
Update package.json
twokul Aug 7, 2020
7f1a8f7
Update .travis.yml
twokul Aug 7, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ language: node_js
node_js:
# we recommend testing addons with the same minimum supported node version as Ember CLI
# so that your addon works for all apps
- '8'
- '12'
twokul marked this conversation as resolved.
Show resolved Hide resolved

dist: trusty

Expand Down
4 changes: 2 additions & 2 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,6 @@
"ember-cli-htmlbars": "^3.0.1",
"ember-cli-htmlbars-inline-precompile": "^2.1.0",
"ember-cli-node-assets": "^0.2.2",
"ember-cli-sass": "^7.0.0",
"ember-cli-version-checker": "^3.0.1",
"ember-compatibility-helpers": "^1.2.0",
"ember-getowner-polyfill": "^2.2.0",
Expand Down Expand Up @@ -66,6 +65,7 @@
"ember-cli-deploy-git-ci": "^1.0.1",
"ember-cli-eslint": "^5.1.0",
"ember-cli-inject-live-reload": "^2.0.1",
"ember-cli-sass": "^10.0.0",
twokul marked this conversation as resolved.
Show resolved Hide resolved
"ember-cli-shims": "^1.2.0",
"ember-cli-sri": "^2.1.0",
"ember-cli-uglify": "^2.0.0",
Expand Down Expand Up @@ -93,7 +93,7 @@
"release-it": "^12.3.4"
},
"engines": {
"node": "8.* || >= 10.*"
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This would require a major version bump re: semver

"node": ">= 12.*"
twokul marked this conversation as resolved.
Show resolved Hide resolved
},
"ember-addon": {
"configPath": "tests/dummy/config"
Expand Down
32 changes: 10 additions & 22 deletions yarn.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3192,7 +3192,7 @@ [email protected]:
symlink-or-copy "^1.0.0"
walk-sync "^0.3.1"

broccoli-funnel@^1.0.0, broccoli-funnel@^1.0.1, broccoli-funnel@^1.1.0:
broccoli-funnel@^1.0.1, broccoli-funnel@^1.1.0:
version "1.2.0"
resolved "https://registry.npmjs.org/broccoli-funnel/-/broccoli-funnel-1.2.0.tgz#cddc3afc5ff1685a8023488fff74ce6fb5a51296"
integrity sha1-zdw6/F/xaFqAI0iP/3TOb7WlEpY=
Expand Down Expand Up @@ -3260,7 +3260,7 @@ broccoli-lint-eslint@^5.0.0:
lodash.defaultsdeep "^4.6.0"
md5-hex "^2.0.0"

broccoli-merge-trees@^1.0.0, broccoli-merge-trees@^1.1.0, broccoli-merge-trees@^1.1.1:
broccoli-merge-trees@^1.0.0, broccoli-merge-trees@^1.1.1:
version "1.2.4"
resolved "https://registry.npmjs.org/broccoli-merge-trees/-/broccoli-merge-trees-1.2.4.tgz#a001519bb5067f06589d91afa2942445a2d0fdb5"
integrity sha1-oAFRm7UGfwZYnZGvopQkRaLQ/bU=
Expand Down Expand Up @@ -3413,18 +3413,6 @@ broccoli-rollup@^4.1.1:
symlink-or-copy "^1.2.0"
walk-sync "^1.1.3"

broccoli-sass-source-maps@^2.1.0:
version "2.2.0"
resolved "https://registry.npmjs.org/broccoli-sass-source-maps/-/broccoli-sass-source-maps-2.2.0.tgz#1f1a0794136152b096188638b59b42b17a4bdc68"
integrity sha512-X1yTOGQcjQxYebP+hjeAI286x63VZ0WfgFxqHsr4eimgNNL2TPxkJKKgOaDKJ3nE8pszbJWgHrWpEVXuwgsUzw==
dependencies:
broccoli-caching-writer "^3.0.3"
include-path-searcher "^0.1.0"
mkdirp "^0.3.5"
node-sass "^4.7.2"
object-assign "^2.0.0"
rsvp "^3.0.6"

broccoli-sass-source-maps@^4.0.0:
version "4.0.0"
resolved "https://registry.npmjs.org/broccoli-sass-source-maps/-/broccoli-sass-source-maps-4.0.0.tgz#1ee4c10a810b10955b0502e28f85ab672f5961a2"
Expand Down Expand Up @@ -5659,14 +5647,14 @@ [email protected]:
broccoli-sass-source-maps "^4.0.0"
ember-cli-version-checker "^2.1.0"

ember-cli-sass@^7.0.0:
version "7.2.0"
resolved "https://registry.npmjs.org/ember-cli-sass/-/ember-cli-sass-7.2.0.tgz#293d1a94c43c1fdbb3835378e43d255e8ad5c961"
integrity sha512-X4BNBYuCyfRMGJ/Bjjk/gQw4eT6ixIXNltDQ8kapymilCqKEBZ6Rlx6noEfVzeh2nK7VP0e4rQ4DBj+TK6EDzA==
ember-cli-sass@^10.0.0:
version "10.0.1"
resolved "https://registry.npmjs.org/ember-cli-sass/-/ember-cli-sass-10.0.1.tgz#afa91eb7dfe3890be0390639d66976512e7d8edc"
integrity sha512-dWVoX03O2Mot1dEB1AN3ofC8DDZb6iU4Kfkbr3WYi9S9bGVHrpR/ngsR7tuVBuTugTyG53FPtLLqYdqx7XjXdA==
dependencies:
broccoli-funnel "^1.0.0"
broccoli-merge-trees "^1.1.0"
broccoli-sass-source-maps "^2.1.0"
broccoli-funnel "^2.0.1"
broccoli-merge-trees "^3.0.1"
broccoli-sass-source-maps "^4.0.0"
ember-cli-version-checker "^2.1.0"

ember-cli-shims@^1.2.0:
Expand Down Expand Up @@ -10705,7 +10693,7 @@ node-sass-import-once@^1.2.0:
dependencies:
js-yaml "^3.2.7"

node-sass@^4.6.0, node-sass@^4.7.2:
node-sass@^4.6.0:
twokul marked this conversation as resolved.
Show resolved Hide resolved
version "4.12.0"
resolved "https://registry.npmjs.org/node-sass/-/node-sass-4.12.0.tgz#0914f531932380114a30cc5fa4fa63233a25f017"
integrity sha512-A1Iv4oN+Iel6EPv77/HddXErL2a+gZ4uBeZUy+a8O35CFYTXhgA8MgLCWBtwpGZdCvTvQ9d+bQxX/QC36GDPpQ==
Expand Down