Skip to content

Commit

Permalink
styles are back
Browse files Browse the repository at this point in the history
  • Loading branch information
AmauryD committed Oct 18, 2023
1 parent c3976ce commit acba4c5
Show file tree
Hide file tree
Showing 9 changed files with 11 additions and 17 deletions.
1 change: 0 additions & 1 deletion app/controllers/reset-password.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ import Controller from '@ember/controller';

import { tracked } from 'tracked-built-ins';

// eslint-disable-next-line ember/no-controllers
export default class ResetPasswordController extends Controller {
@tracked token?: string;

Expand Down
3 changes: 1 addition & 2 deletions app/services/error-handler.ts
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ export default class ErrorHandlerService extends Service {
@service declare flashMessages: FlashMessageService;

public handle(changeset: Changeset, errors: Error[] | string) {
console.log('handle', changeset, errors);

this.flashMessages.danger(errors.toString());
}
}
4 changes: 2 additions & 2 deletions ember-cli-build.js
Original file line number Diff line number Diff line change
Expand Up @@ -37,9 +37,9 @@ module.exports = function (defaults) {
path: ['node_modules'],
},
},
require('tailwindcss')('./app/tailwind/tailwind.config.js'),
require('tailwindcss')('tailwind.config.js'),
],
cacheInclude: [/.*\.(css|hbs|html)$/, /tailwind\.config\.js/],
cacheInclude: [/.*\.(css|hbs|html|gts|gjs|ts)$/, /tailwind\.config\.js/],
},
},
});
Expand Down
1 change: 0 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,6 @@
"@triptyk/ember-ui": "file:../ember-common-ui/packages/ember-ui",
"@triptyk/ember-utils": "^1.2.2",
"@tsconfig/ember": "~3.0.1",
"@types/ember": "^4.0.8",
"@types/ember-data": "~4.4.13",
"@types/ember-data__adapter": "~4.0.4",
"@types/ember-data__model": "~4.0.3",
Expand Down
3 changes: 0 additions & 3 deletions pnpm-lock.yaml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

File renamed without changes.
2 changes: 1 addition & 1 deletion read-cov.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
/* eslint-disable no-console */
const fs = require('fs');
const { join } = require('path');

Expand All @@ -19,6 +18,7 @@ const out = JSON.parse(fs.readFileSync(join(process.cwd(), covPath)));
const covResults = Object.entries(out.total);

if (covResults.map(([, value]) => value.pct).some((e) => e < threshold)) {
// eslint-disable-next-line no-console
console.log(covResults);

if (dryRun) {
Expand Down
8 changes: 4 additions & 4 deletions app/tailwind/tailwind.config.js → tailwind.config.js
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
/* eslint-disable no-undef */
const colors = require('tailwindcss/colors');

const extensions = ['js', 'ts', 'hbs', 'html','gjs', 'gts'];

module.exports = {
content: [
'./app/**/*.{hbs,js,ts,html}',
'./tests/**/*.{hbs,js,ts,html}',
'./node_modules/@triptyk/tpk-ember-input/addon/**/*.{hbs,ts}',
`./app/**/*.{${extensions.join(',')}}`,
`./tests/**/*.{${extensions.join(',')}}`
],
corePlugins: {},
plugins: [],
Expand Down
6 changes: 3 additions & 3 deletions with-backend.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,3 @@
/* eslint-disable n/no-process-exit */
/* eslint-disable no-process-exit */
/* eslint-disable no-console */
const [, , backendCommand, frontendCommand] = process.argv;
const child_process = require('child_process');

Expand All @@ -14,12 +11,14 @@ const launchBackend = child_process.spawn(backendCommand, {
launchBackend.stdout.pipe(process.stdout);
launchBackend.on('close', () => {
if (launchBackend.exitCode !== null) {
// eslint-disable-next-line n/no-process-exit
process.exit(launchBackend.exitCode);
}
});

launchBackend.stdout.on('data', (data) => {
if (data.toString().includes('Listening on port')) {
// eslint-disable-next-line no-console
console.log(`backend launched, doing ${frontendCommand}`);

const exec = child_process.spawn(frontendCommand, {
Expand All @@ -33,6 +32,7 @@ launchBackend.stdout.on('data', (data) => {
process.kill(-launchBackend.pid);

if (exec.exitCode !== null) {
// eslint-disable-next-line n/no-process-exit
process.exit(exec.exitCode);
}
});
Expand Down

0 comments on commit acba4c5

Please sign in to comment.