Skip to content

Commit 5ac9920

Browse files
Get things booting at least
1 parent 5d38bf9 commit 5ac9920

59 files changed

Lines changed: 2581 additions & 2541 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.ember-cli

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,5 +3,17 @@
33
Setting `isTypeScriptProject` to true will force the blueprint generators to generate TypeScript
44
rather than JavaScript by default, when a TypeScript version of a given blueprint is available.
55
*/
6-
"isTypeScriptProject": true
6+
"isTypeScriptProject": true,
7+
8+
/**
9+
Setting `componentAuthoringFormat` to "strict" will force the blueprint generators to generate GJS
10+
or GTS files for the component and the component rendering test. "loose" is the default.
11+
*/
12+
"componentAuthoringFormat": "strict",
13+
14+
/**
15+
Setting `routeAuthoringFormat` to "strict" will force the blueprint generators to generate GJS
16+
or GTS templates for routes. "loose" is the default
17+
*/
18+
"routeAuthoringFormat": "strict"
719
}

.github/workflows/ci.yml

Lines changed: 53 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,53 @@
1+
name: CI
2+
3+
on:
4+
push:
5+
branches:
6+
- main
7+
- master
8+
pull_request: {}
9+
10+
concurrency:
11+
group: ci-${{ github.head_ref || github.ref }}
12+
cancel-in-progress: true
13+
14+
jobs:
15+
lint:
16+
name: "Lint"
17+
runs-on: ubuntu-latest
18+
timeout-minutes: 10
19+
20+
steps:
21+
- uses: actions/checkout@v3
22+
- uses: pnpm/action-setup@v4
23+
with:
24+
version: 9
25+
- name: Install Node
26+
uses: actions/setup-node@v3
27+
with:
28+
node-version: 18
29+
cache: pnpm
30+
- name: Install Dependencies
31+
run: pnpm install --frozen-lockfile
32+
- name: Lint
33+
run: pnpm lint
34+
35+
test:
36+
name: "Test"
37+
runs-on: ubuntu-latest
38+
timeout-minutes: 10
39+
40+
steps:
41+
- uses: actions/checkout@v3
42+
- uses: pnpm/action-setup@v4
43+
with:
44+
version: 9
45+
- name: Install Node
46+
uses: actions/setup-node@v3
47+
with:
48+
node-version: 18
49+
cache: pnpm
50+
- name: Install Dependencies
51+
run: pnpm install --frozen-lockfile
52+
- name: Run Tests
53+
run: pnpm test

.gitignore

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,14 @@
33
# compiled output
44
/dist/
55
/declarations/
6+
/tmp/
67

78
# dependencies
89
/node_modules/
910

1011
# misc
1112
/.env*
13+
*.local
1214
/.pnp*
1315
/.sass-cache
1416
/.eslintcache
@@ -19,6 +21,13 @@
1921
/testem.log
2022
/yarn-error.log
2123

24+
# ember-try
25+
/.node_modules.ember-try/
26+
/npm-shrinkwrap.json.ember-try
27+
/package.json.ember-try
28+
/package-lock.json.ember-try
29+
/yarn.lock.ember-try
30+
2231
# broccoli-debug
2332
/DEBUG/
2433

.prettierrc.js renamed to .prettierrc.mjs

Lines changed: 31 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
'use strict';
2-
31
const testing = [
42
'^ember-cli-htmlbars($|\\/)',
53
'^qunit',
@@ -34,18 +32,45 @@ const importOrder = [
3432
];
3533
const importOrderParserPlugins = ['typescript', 'decorators-legacy'];
3634

37-
module.exports = {
35+
export default {
3836
plugins: [
3937
'prettier-plugin-ember-template-tag',
4038
'@ianvs/prettier-plugin-sort-imports',
4139
],
4240
importOrder,
4341
importOrderParserPlugins,
42+
singleQuote: true,
4443
overrides: [
4544
{
46-
files: '*.{js,gjs,ts,gts,mjs,mts,cjs,cts}',
47-
options: { singleQuote: true, templateSingleQuote: false },
45+
files: ['*.js', '*.ts', '*.cjs', '.mjs', '.cts', '.mts', '.cts'],
46+
options: {
47+
trailingComma: 'es5',
48+
},
49+
},
50+
{
51+
files: ['*.html'],
52+
options: {
53+
singleQuote: false,
54+
},
55+
},
56+
{
57+
files: ['*.json'],
58+
options: {
59+
singleQuote: false,
60+
},
61+
},
62+
{
63+
files: ['*.hbs'],
64+
options: {
65+
singleQuote: false,
66+
},
67+
},
68+
{
69+
files: ['*.gjs', '*.gts'],
70+
options: {
71+
templateSingleQuote: false,
72+
trailingComma: 'es5',
73+
},
4874
},
49-
{ files: '*.{yaml,yml}', options: { singleQuote: true } },
5075
],
5176
};
File renamed without changes.
Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
1-
'use strict';
2-
3-
module.exports = {
4-
extends: ['recommended'],
1+
export default {
2+
extends: 'recommended',
53
rules: {
64
'no-at-ember-render-modifiers': false,
75
'no-builtin-form-components': false,

app/app.ts

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ import { InitSentryForEmber } from '@sentry/ember';
33
import loadInitializers from 'ember-load-initializers';
44
import Resolver from 'ember-resolver';
55
import { importSync, isDevelopingApp, macroCondition } from '@embroider/macros';
6+
import compatModules from '@embroider/virtual/compat-modules';
67
import config from 'swach/config/environment';
78

89
if (macroCondition(isDevelopingApp())) {
@@ -14,7 +15,7 @@ InitSentryForEmber();
1415
export default class App extends Application {
1516
modulePrefix = config.modulePrefix;
1617
podModulePrefix = config.podModulePrefix;
17-
Resolver = Resolver;
18+
Resolver = Resolver.withModules(compatModules);
1819
}
1920

20-
loadInitializers(App, config.modulePrefix);
21+
loadInitializers(App, config.modulePrefix, compatModules);

app/components/alpha-input.gts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import { action, set } from '@ember/object';
44
import Component from '@glimmer/component';
55
// @ts-expect-error TODO: fix this
66
import OneWayInputMask from 'ember-inputmask/_app_/components/one-way-input-mask.js';
7-
import type { SelectedColorModel } from 'swach/components/rgb-input';
7+
import type { SelectedColorModel } from './rgb-input.gts';
88
import { rgbaToHex } from 'swach/data-models/color';
99

1010
interface AlphaInputSignature {

app/components/color-picker.gts

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,15 +16,15 @@ import { rgbaToHex } from '../data-models/color.ts';
1616
import type ColorModel from '../data-models/color.ts';
1717
import type NearestColor from '../services/nearest-color.ts';
1818
import type UndoManager from '../services/undo-manager.ts';
19-
import AlphaInput from './alpha-input.ts';
20-
import ColorRow from './color-row.ts';
21-
import HexInput from './hex-input.ts';
22-
import RgbInput from './rgb-input.ts';
19+
import AlphaInput from './alpha-input.gts';
20+
import ColorRow from './color-row.gts';
21+
import HexInput from './hex-input.gts';
22+
import RgbInput from './rgb-input.gts';
2323
import type {
2424
PrivateRGBAHex,
2525
PublicRGBAHex,
2626
SelectedColorModel,
27-
} from './rgb-input.ts';
27+
} from './rgb-input.gts';
2828

2929
interface ColorPickerSignature {
3030
Element: HTMLDivElement;

app/components/color-row.gts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ import Component from '@glimmer/component';
88
import stopPropagation from 'ember-event-helpers/helpers/stop-propagation';
99
import svgJar from 'ember-svg-jar/helpers/svg-jar';
1010
import htmlSafe from '../helpers/html-safe.ts';
11-
import OptionsMenu from './options-menu.ts';
12-
import type { SelectedColorModel } from './rgb-input.ts';
11+
import OptionsMenu from './options-menu.gts';
12+
import type { SelectedColorModel } from './rgb-input.gts';
1313
import type ColorModel from 'swach/data-models/color';
1414
import type PaletteModel from 'swach/data-models/palette';
1515
import type ColorUtils from 'swach/services/color-utils';

0 commit comments

Comments
 (0)