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.

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

update node-sass and ember-auto-import #900

Merged
merged 2 commits into from
Dec 8, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
16 changes: 4 additions & 12 deletions app/services/algolia.js
Original file line number Diff line number Diff line change
@@ -1,27 +1,20 @@
import Service from '@ember/service';
import algoliasearch from 'algoliasearch';
import config from 'ember-api-docs/config/environment';
import { denodeify } from 'rsvp';

export default class AlgoliaService extends Service {
_search(query, params, callback) {
if (!callback) {
callback = params;
params = undefined;
}
async search(query, params) {
if (query) {
if (Array.isArray(query) && !params) {
// if multiple indices
this._client.search(query, callback);
return this._client.search(query);
} else if (!params) {
// if no params
this.accessIndex(query.indexName).search(query.query, callback);
return this.accessIndex(query.indexName).search(query.query);
} else {
// if params and callback
this.accessIndex(query.indexName).search(query.query, params, callback);
return this.accessIndex(query.indexName).search(query.query, params);
}
} else {
callback(new Error(`Could not search algolia for query "${query}"`));
}
}

Expand All @@ -39,6 +32,5 @@ export default class AlgoliaService extends Service {
config.algolia.algoliaKey
);
this._indices = {};
this.search = denodeify(this._search.bind(this));
}
}
14 changes: 6 additions & 8 deletions app/styles/base/_forms.scss
Original file line number Diff line number Diff line change
@@ -1,9 +1,7 @@
@use "sass:math";

fieldset {
background-color: lighten($base-border-color, 10%);
border: $base-border;
margin: 0 0 $small-spacing;
margin: 0 0 var(--small-spacing);
padding: $base-spacing;
}

Expand All @@ -30,7 +28,7 @@ select {

label {
font-weight: 600;
margin-bottom: math.div($small-spacing, 2);
margin-bottom: calc(--sass-small-spacing / 2);

&.required::after {
content: "*";
Expand All @@ -50,8 +48,8 @@ textarea {
box-sizing: border-box;
font-family: $base-font-family;
font-size: $base-font-size;
margin-bottom: math.div($base-spacing, 2);
padding: math.div($base-spacing, 3);
margin-bottom: calc($base-spacing / 2);
padding: calc($base-spacing / 3);
transition: border-color;
width: 100%;

Expand All @@ -74,10 +72,10 @@ textarea {
input[type="checkbox"],
input[type="radio"] {
display: inline;
margin-right: math.div($small-spacing, 2);
margin-right: calc(--small-spacing / 2);
}

input[type="file"] {
padding-bottom: $small-spacing;
padding-bottom: var(--small-spacing);
width: 100%;
}
10 changes: 5 additions & 5 deletions app/styles/base/_lists.scss
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ ol {

&%default-ul {
list-style-type: disc;
margin-bottom: $small-spacing;
margin-bottom: var(--small-spacing);
padding-left: $base-spacing;

@media (max-width: $mobile-portrait-screen){
Expand All @@ -21,12 +21,12 @@ ol {
> li {
counter-increment: customlistcounter;
clear: both;
padding: $small-spacing 0 $small-spacing 2em;
padding: var(--small-spacing) 0 var(--small-spacing) 2em;
position: relative;
z-index: 1;

&::before {
@include position(absolute, ($small-spacing + 0.5em) null null 0);
@include position(absolute, (var(--small-spacing) + 0.5em) null null 0);
@include size(2em);
content: counter(customlistcounter) " ";
border: 2px solid $base-border-color;
Expand All @@ -47,11 +47,11 @@ ol {
}

dl {
margin-bottom: $small-spacing;
margin-bottom: var(--small-spacing);

dt {
font-weight: bold;
margin-top: $small-spacing;
margin-top: var(--small-spacing);
}

dd {
Expand Down
4 changes: 2 additions & 2 deletions app/styles/base/_tables.scss
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
table {
font-feature-settings: "kern", "liga", "tnum";
border-collapse: collapse;
margin: $small-spacing 0;
margin: var(--small-spacing) 0;
table-layout: fixed;
width: 100%;
position: relative;
Expand All @@ -23,7 +23,7 @@ td {
}

th, td {
padding: $small-spacing;
padding: var(--small-spacing);
}

tr,
Expand Down
4 changes: 2 additions & 2 deletions app/styles/base/_typography.scss
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ h6 {
font-family: $heading-font-family;
font-size: $base-font-size;
line-height: $heading-line-height;
margin: 0 0 $small-spacing;
margin: 0 0 var(--small-spacing);
font-weight: bold;

code {
Expand All @@ -43,7 +43,7 @@ h2 {
}

p {
margin: 1.5em 0 $small-spacing;
margin: 1.5em 0 var(--small-spacing);
line-height: 1.5em;
}

Expand Down
9 changes: 6 additions & 3 deletions app/styles/base/_variables.scss
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
@use "sass:math";

// Typography
$base-font-family: 'Source Sans Pro', sans-serif;
$heading-font-family: $base-font-family;
Expand All @@ -15,9 +13,14 @@ $large-font-size: 1.5rem;
$base-line-height: 1.5;
$heading-line-height: 1.2;

:root {
--base-line-height: 1.5;
--base-spacing: calc(var(--base-line-height) * 1em);
--small-spacing: calc(var(--base-spacing) / 2);
}

// Spacing
$base-spacing: $base-line-height * 1em;
$small-spacing: math.div($base-spacing, 2);
$large-spacing: $base-spacing * 2;
$top-spacing: $base-spacing * 3.333; // 80px

Expand Down
4 changes: 2 additions & 2 deletions app/styles/components/_article.scss
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
article {
padding: $large-spacing $small-spacing;
padding: $large-spacing var(--small-spacing);

@media (min-width: $medium-screen){
padding: $small-spacing;
padding: var(--small-spacing);
}

.edit-page {
Expand Down
2 changes: 1 addition & 1 deletion app/styles/components/_class-field-desc.scss
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
.chapter li {
margin: $small-spacing 0;
margin: var(--small-spacing) 0;

@media (max-width: $mobile-portrait-screen) {
margin: 0;
Expand Down
4 changes: 2 additions & 2 deletions app/styles/components/_highlight.scss
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
font-family: $monospace-font-family;
font-size: 0.8em;
line-height: 1.5em;
margin: $small-spacing 0 $large-spacing;
margin: var(--small-spacing) 0 $large-spacing;
overflow: hidden;
position: relative;
font-variant-ligatures: none;
Expand All @@ -28,7 +28,7 @@
}
}
}

.scroller {
overflow: auto;
}
Expand Down
10 changes: 5 additions & 5 deletions app/styles/components/_sidebar.scss
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
border-bottom: $base-border;
position: relative;
z-index: 1;
padding: $small-spacing 0;
padding: var(--small-spacing) 0;

@include media($large-screen-up) {
// fixed sidebar, full height
Expand All @@ -12,7 +12,7 @@
width: 19em;
border-bottom: 0;
border-right: $base-border;
padding: $small-spacing $base-spacing $base-spacing * 1.5;
padding: var(--small-spacing) $base-spacing $base-spacing * 1.5;

&::before {
@include position(absolute, 0 0 0 -100vw);
Expand Down Expand Up @@ -123,14 +123,14 @@ ol.toc-level-1 {
font-size: $base-font-size * 0.9;
transition: max-height 0.5s ease;

&.selected{
&.selected{
max-height: 3000px;
}

&:not(.selected) {
overflow: hidden;
max-height: 0;
}
}

li {
border-left: 3px solid transparent;
Expand All @@ -148,6 +148,6 @@ ol.toc-level-1 {
}

a {
padding-left: $small-spacing;
padding-left: var(--small-spacing);
}
}
9 changes: 2 additions & 7 deletions ember-cli-build.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ const Funnel = require('broccoli-funnel');
const mergeTrees = require('broccoli-merge-trees');
const envIsProduction = process.env.EMBER_ENV === 'production';
const premberUrls = require('./prember-urls');
const nodeSass = require('node-sass');

module.exports = function (defaults) {
let app = new EmberApp(defaults, {
Expand All @@ -25,20 +26,14 @@ module.exports = function (defaults) {
generateAssetMap: true,
},
sassOptions: {
implementation: nodeSass,
sourceMapEmbed: !envIsProduction,
includePaths: [
'app/styles',
'node_modules/bourbon-neat/app/assets/stylesheets',
'node_modules/normalize.css',
],
},
autoImport: {
webpack: {
node: {
process: 'mock',
},
},
},
autoprefixer: {
enabled: true,
cascade: true,
Expand Down
Loading