Skip to content

Commit 3213205

Browse files
NullVoxPopuliNullVoxPopuli
authored
Merge branch 'main' into nvp/type-module
2 parents 5f8a9fb + 09e3f0f commit 3213205

90 files changed

Lines changed: 10241 additions & 825 deletions

File tree

Some content is hidden

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

‎.github/workflows/ci.yml‎

Lines changed: 101 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,101 @@
1+
name: CI
2+
3+
on:
4+
workflow_dispatch:
5+
pull_request:
6+
push:
7+
branches:
8+
- main
9+
schedule:
10+
- cron: '0 3 * * 0' # every Sunday at 3am
11+
12+
env:
13+
CI: true
14+
15+
jobs:
16+
tests:
17+
name: Tests
18+
timeout-minutes: 5
19+
runs-on: ubuntu-latest
20+
strategy:
21+
fail-fast: false
22+
matrix:
23+
# how to say "not these" so we don't miss anything?
24+
# waiting on a an api from vitest for querying
25+
# the list of tests ahead of time before running them.
26+
#
27+
# https://github.com/vitest-dev/vitest/issues/2901
28+
#
29+
# It would be great if vitest had a flag to give us the JSON of all the tests,
30+
# so we could be sure we don't miss anything
31+
# and then generate this list from a previous C.I. job
32+
slow-test:
33+
# flags
34+
- addon-location
35+
- test-app-location
36+
- addon-only
37+
38+
# existing monorepo
39+
- monorepo with npm
40+
- monorepo with pnpm
41+
42+
# build-only tests for testing if the rollup config works at all
43+
- rollup-build
44+
- declarations-configuration
45+
46+
steps:
47+
- uses: actions/checkout@v4
48+
- uses: pnpm/action-setup@v4
49+
- uses: actions/setup-node@v4
50+
with:
51+
node-version: 18
52+
cache: pnpm
53+
- name: Install Dependencies
54+
run: pnpm install --frozen-lockfile
55+
- run: pnpm vitest --testNamePattern "${{ matrix.slow-test }}"
56+
working-directory: tests
57+
58+
59+
defaults_tests:
60+
name: "Slow tests: ${{ matrix.slow-test }}"
61+
timeout-minutes: 5
62+
runs-on: ubuntu-latest
63+
strategy:
64+
fail-fast: false
65+
matrix:
66+
slow-test:
67+
- defaults with npm
68+
- defaults with pnpm
69+
steps:
70+
- uses: actions/checkout@v4
71+
- uses: pnpm/action-setup@v4
72+
- uses: actions/setup-node@v4
73+
with:
74+
node-version: 18
75+
cache: pnpm
76+
- name: Install Dependencies
77+
run: pnpm install --frozen-lockfile
78+
- run: pnpm vitest --testNamePattern "${{ matrix.slow-test }}"
79+
working-directory: tests
80+
81+
typescript_tests:
82+
name: "Slow tests: ${{ matrix.slow-test }}"
83+
timeout-minutes: 5
84+
runs-on: ubuntu-latest
85+
strategy:
86+
fail-fast: false
87+
matrix:
88+
slow-test:
89+
- typescript with npm
90+
- typescript with pnpm
91+
steps:
92+
- uses: actions/checkout@v4
93+
- uses: pnpm/action-setup@v4
94+
- uses: actions/setup-node@v4
95+
with:
96+
node-version: 18
97+
cache: pnpm
98+
- name: Install Dependencies
99+
run: pnpm install --frozen-lockfile
100+
- run: pnpm vitest --testNamePattern "${{ matrix.slow-test }}"
101+
working-directory: tests

‎.release-plan.json‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
"solution": {
33
"@ember/addon-blueprint": {
44
"impact": "patch",
5-
"oldVersion": "0.1.0",
6-
"newVersion": "0.1.1",
5+
"oldVersion": "0.5.0",
6+
"newVersion": "0.5.1",
77
"tagName": "latest",
88
"constraints": [
99
{
@@ -14,5 +14,5 @@
1414
"pkgJSONPath": "./package.json"
1515
}
1616
},
17-
"description": "## Release (2025-03-27)\n\n* @ember/addon-blueprint 0.1.1 (patch)\n\n#### :bug: Bug Fix\n* `@ember/addon-blueprint`\n * [#4](https://github.com/ember-cli/ember-addon-blueprint/pull/4) fix release-plan use with pnpm ([@mansona](https://github.com/mansona))\n\n#### Committers: 1\n- Chris Manson ([@mansona](https://github.com/mansona))\n"
17+
"description": "## Release (2025-05-10)\n\n* @ember/addon-blueprint 0.5.1 (patch)\n\n#### :bug: Bug Fix\n* `@ember/addon-blueprint`\n * [#35](https://github.com/ember-cli/ember-addon-blueprint/pull/35) Remove ember-source as a peer dependency ([@NullVoxPopuli](https://github.com/NullVoxPopuli))\n\n#### Committers: 1\n- [@NullVoxPopuli](https://github.com/NullVoxPopuli)\n"
1818
}

‎CHANGELOG.md‎

Lines changed: 73 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,78 @@
11
# Changelog
22

3+
## Release (2025-05-10)
4+
5+
* @ember/addon-blueprint 0.5.1 (patch)
6+
7+
#### :bug: Bug Fix
8+
* `@ember/addon-blueprint`
9+
* [#35](https://github.com/ember-cli/ember-addon-blueprint/pull/35) Remove ember-source as a peer dependency ([@NullVoxPopuli](https://github.com/NullVoxPopuli))
10+
11+
#### Committers: 1
12+
- [@NullVoxPopuli](https://github.com/NullVoxPopuli)
13+
14+
## Release (2025-05-04)
15+
16+
* @ember/addon-blueprint 0.5.0 (minor)
17+
18+
#### :rocket: Enhancement
19+
* `@ember/addon-blueprint`
20+
* [#32](https://github.com/ember-cli/ember-addon-blueprint/pull/32) Rename testem.js -> testem.cjs ([@NullVoxPopuli](https://github.com/NullVoxPopuli))
21+
* [#31](https://github.com/ember-cli/ember-addon-blueprint/pull/31) Simplify tsconfig ([@NullVoxPopuli](https://github.com/NullVoxPopuli))
22+
* [#30](https://github.com/ember-cli/ember-addon-blueprint/pull/30) Split out Lint to its own job ([@NullVoxPopuli](https://github.com/NullVoxPopuli))
23+
24+
#### Committers: 1
25+
- [@NullVoxPopuli](https://github.com/NullVoxPopuli)
26+
27+
## Release (2025-04-09)
28+
29+
* @ember/addon-blueprint 0.4.0 (minor)
30+
31+
#### :rocket: Enhancement
32+
* `@ember/addon-blueprint`
33+
* [#28](https://github.com/ember-cli/ember-addon-blueprint/pull/28) Unskip build test - make sure test work out of the box ([@mansona](https://github.com/mansona))
34+
35+
#### :bug: Bug Fix
36+
* `@ember/addon-blueprint`
37+
* [#26](https://github.com/ember-cli/ember-addon-blueprint/pull/26) Import tests from @embroider/addon-blueprint ([@mansona](https://github.com/mansona))
38+
39+
#### Committers: 1
40+
- Chris Manson ([@mansona](https://github.com/mansona))
41+
42+
## Release (2025-04-03)
43+
44+
* @ember/addon-blueprint 0.3.0 (minor)
45+
46+
#### :rocket: Enhancement
47+
* `@ember/addon-blueprint`
48+
* [#11](https://github.com/ember-cli/ember-addon-blueprint/pull/11) Switch to our own tsconfig ([@NullVoxPopuli](https://github.com/NullVoxPopuli))
49+
50+
#### :bug: Bug Fix
51+
* `@ember/addon-blueprint`
52+
* [#24](https://github.com/ember-cli/ember-addon-blueprint/pull/24) Remove unused file: additional-test-app-package.json ([@NullVoxPopuli](https://github.com/NullVoxPopuli))
53+
* [#25](https://github.com/ember-cli/ember-addon-blueprint/pull/25) Fix babel configs / sync typescript options ([@NullVoxPopuli](https://github.com/NullVoxPopuli))
54+
* [#20](https://github.com/ember-cli/ember-addon-blueprint/pull/20) Remove references to the old package name ([@Windvis](https://github.com/Windvis))
55+
* [#19](https://github.com/ember-cli/ember-addon-blueprint/pull/19) filter out the .github folder when ciProvider is not github ([@BoussonKarel](https://github.com/BoussonKarel))
56+
* [#18](https://github.com/ember-cli/ember-addon-blueprint/pull/18) remove duplicate key allowDeclareFields from babel config ([@BoussonKarel](https://github.com/BoussonKarel))
57+
* [#17](https://github.com/ember-cli/ember-addon-blueprint/pull/17) fix some linting issues (prettier, eslint) ([@BoussonKarel](https://github.com/BoussonKarel))
58+
* [#16](https://github.com/ember-cli/ember-addon-blueprint/pull/16) add missing imports from node:path to rollup config ([@BoussonKarel](https://github.com/BoussonKarel))
59+
60+
#### Committers: 3
61+
- Sam Van Campenhout ([@Windvis](https://github.com/Windvis))
62+
- [@BoussonKarel](https://github.com/BoussonKarel)
63+
- [@NullVoxPopuli](https://github.com/NullVoxPopuli)
64+
65+
## Release (2025-04-02)
66+
67+
* @ember/addon-blueprint 0.2.0 (minor)
68+
69+
#### :rocket: Enhancement
70+
* `@ember/addon-blueprint`
71+
* [#7](https://github.com/ember-cli/ember-addon-blueprint/pull/7) add basic test app ([@mansona](https://github.com/mansona))
72+
73+
#### Committers: 1
74+
- Chris Manson ([@mansona](https://github.com/mansona))
75+
376
## Release (2025-03-27)
477

578
* @ember/addon-blueprint 0.1.1 (patch)

‎README.md‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ Sets up the new addon with [`pnpm`](https://pnpm.io/) as a default package manag
2828
Example:
2929

3030
```bash
31-
npx ember-cli@latest addon my-addon -b @embroider/addon-blueprint --pnpm
31+
npx ember-cli@latest addon my-addon -b @ember/addon-blueprint --pnpm
3232
cd my-addon
3333
```
3434

@@ -39,7 +39,7 @@ Sets up the new addon with `npm` as a default.
3939
Example:
4040

4141
```bash
42-
npx ember-cli@latest addon my-addon -b @embroider/addon-blueprint --npm
42+
npx ember-cli@latest addon my-addon -b @ember/addon-blueprint --npm
4343
cd my-addon
4444
```
4545

@@ -50,7 +50,7 @@ Sets up the new addon with [`typescript`](https://www.typescriptlang.org/) suppo
5050
Example:
5151

5252
```bash
53-
npx ember-cli@latest addon my-addon -b @embroider/addon-blueprint --typescript
53+
npx ember-cli@latest addon my-addon -b @ember/addon-blueprint --typescript
5454
```
5555

5656
### Updating the addon

‎additional-test-app-package.json‎

Lines changed: 0 additions & 7 deletions
This file was deleted.

‎files/.github/workflows/ci.yml‎

Lines changed: 17 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@ concurrency:
1212
cancel-in-progress: true
1313

1414
jobs:
15-
test:
16-
name: "Tests"
15+
lint:
16+
name: "Lints"
1717
runs-on: ubuntu-latest
1818
timeout-minutes: 10
1919

@@ -28,6 +28,21 @@ jobs:
2828
run: <%= pnpm ? 'pnpm install --frozen-lockfile' : yarn ? 'yarn install --frozen-lockfile' : 'npm ci' %>
2929
- name: Lint
3030
run: <%= pnpm ? 'pnpm' : yarn ? 'yarn' : 'npm run' %> lint
31+
32+
test:
33+
name: "Tests"
34+
runs-on: ubuntu-latest
35+
timeout-minutes: 10
36+
37+
steps:
38+
- uses: actions/checkout@v4<% if (pnpm) { %>
39+
- uses: pnpm/action-setup@v4<% } %>
40+
- uses: actions/setup-node@v4
41+
with:
42+
node-version: 18
43+
cache: <%= pnpm ? 'pnpm' : yarn ? 'yarn' : 'npm' %>
44+
- name: Install Dependencies
45+
run: <%= pnpm ? 'pnpm install --frozen-lockfile' : yarn ? 'yarn install --frozen-lockfile' : 'npm ci' %>
3146
- name: Run Tests
3247
run: <%= pnpm ? 'pnpm' : yarn ? 'yarn' : 'npm run' %> test
3348

‎files/.prettierignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,3 +8,4 @@
88
# misc
99
/coverage/
1010
pnpm-lock.yaml
11+
config/ember-cli-update.json

‎files/babel.config.cjs‎

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
const { buildMacros } = require('@embroider/macros/babel');
2+
3+
const macros = buildMacros();
4+
5+
module.exports = {
6+
plugins: [<% if (typescript) { %>
7+
['@babel/plugin-transform-typescript', {
8+
allExtensions: true,
9+
allowDeclareFields: true,
10+
onlyRemoveTypeImports: true,
11+
}],<% } %>
12+
[
13+
'babel-plugin-ember-template-compilation',
14+
{
15+
transforms: [...macros.templateMacros],
16+
},
17+
],
18+
[
19+
'module:decorator-transforms',
20+
{
21+
runtime: {
22+
import: require.resolve('decorator-transforms/runtime-esm'),
23+
},
24+
},
25+
],
26+
...macros.babelMacros,
27+
],
28+
29+
generatorOpts: {
30+
compact: false,
31+
},
32+
};

‎files/babel.config.json‎

Lines changed: 0 additions & 24 deletions
This file was deleted.

‎files/babel.publish.config.cjs‎

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
module.exports = {
2+
plugins: [<% if (typescript) { %>
3+
[
4+
'@babel/plugin-transform-typescript',
5+
{
6+
allExtensions: true,
7+
allowDeclareFields: true,
8+
onlyRemoveTypeImports: true,
9+
},
10+
],<% } %>
11+
[
12+
'babel-plugin-ember-template-compilation',
13+
{
14+
targetFormat: 'hbs',
15+
transforms: [],
16+
},
17+
],
18+
[
19+
'module:decorator-transforms',
20+
{
21+
runtime: {
22+
import: 'decorator-transforms/runtime-esm',
23+
},
24+
},
25+
],
26+
],
27+
28+
generatorOpts: {
29+
compact: false,
30+
},
31+
};

0 commit comments

Comments
 (0)