Skip to content

Commit 53509cc

Browse files
dfreemandfreeman
authored
Merge pull request #340 from salsify/standalone-template-transform
First-class Embroider + GJS/GTS Support
2 parents d0b8742 + 030d1f7 commit 53509cc

File tree

418 files changed

+13838
-19006
lines changed

Some content is hidden

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

418 files changed

+13838
-19006
lines changed

‎.github/release.yml‎

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
changelog:
2+
exclude:
3+
authors:
4+
- dependabot
5+
categories:
6+
- title: '💥 Breaking Changes'
7+
labels:
8+
- breaking
9+
- title: '🚀 Features'
10+
labels:
11+
- enhancement
12+
- title: '🐞 Bugfixes'
13+
labels:
14+
- bug
15+
- title: '🧹 Housekeeping'
16+
labels:
17+
- housekeeping
18+
- title: Other Changes
19+
labels:
20+
- "*"

‎.github/workflows/ci.yml‎

Lines changed: 38 additions & 107 deletions
Original file line numberDiff line numberDiff line change
@@ -8,127 +8,58 @@ on:
88
branches:
99
- master
1010
- 'v*'
11+
- standalone-template-transform
1112
# always run CI for tags
1213
tags:
1314
- '*'
1415

15-
# early issue detection: run CI weekly on Sundays
16-
schedule:
17-
- cron: '0 6 * * 0'
18-
1916
env:
2017
CI: true
2118

2219
jobs:
23-
test-locked-deps:
24-
name: Locked Deps
25-
runs-on: ubuntu-latest
26-
steps:
27-
- name: Checkout Code
28-
uses: actions/checkout@v1
29-
- name: Install Node
30-
uses: actions/setup-node@v1
31-
with:
32-
node-version: 16
33-
- name: Install Dependencies
34-
run: yarn install --frozen-lockfile
35-
- name: Run Tests
36-
run: yarn workspace ember-css-modules test
37-
38-
test-old-dependencies:
39-
name: Oldest Supported Env
40-
runs-on: ubuntu-latest
41-
steps:
42-
- name: Checkout Code
43-
uses: actions/checkout@v1
44-
- name: Install Node
45-
uses: actions/setup-node@v1
46-
with:
47-
node-version: 12
48-
- name: Install Dependencies
49-
run: yarn install --frozen-lockfile
50-
working-directory: test-packages/old-app
51-
- name: Run Tests
52-
run: yarn test
53-
working-directory: test-packages/old-app
54-
55-
test-latest-ember-cli:
56-
name: Latest CLI
57-
runs-on: ubuntu-latest
58-
needs: [test-locked-deps]
59-
steps:
60-
- name: Checkout Code
61-
uses: actions/checkout@v1
62-
- name: Install Node
63-
uses: actions/setup-node@v1
64-
with:
65-
node-version: 16
66-
- name: Install Dependencies
67-
run: yarn install --frozen-lockfile
68-
- name: Install Latest `ember-cli`
69-
run: yarn workspace ember-css-modules add --dev ember-cli@latest
70-
- name: Run Tests
71-
run: yarn workspace ember-css-modules test
72-
73-
74-
test-windows:
75-
name: Windows
76-
runs-on: windows-latest
77-
needs: [test-locked-deps]
78-
steps:
79-
- name: Checkout Code
80-
uses: actions/checkout@v1
81-
- name: Install Node
82-
uses: actions/setup-node@v1
83-
with:
84-
node-version: 16
85-
- name: Install Dependencies
86-
run: yarn install --frozen-lockfile
87-
- name: Run Tests
88-
run: yarn workspace ember-css-modules test:ember
89-
90-
test-try:
91-
name: Ember Try
92-
runs-on: ubuntu-latest
93-
needs: [test-locked-deps]
20+
test:
21+
name: Test
9422
strategy:
23+
fail-fast: true
9524
matrix:
96-
scenario:
97-
- ember-release
98-
- ember-beta
99-
- ember-canary
25+
os: [ubuntu-latest, windows-latest]
26+
runs-on: ${{ matrix.os }}
10027
steps:
10128
- name: Checkout Code
102-
uses: actions/checkout@v1
29+
uses: actions/checkout@v4
10330
- name: Install Node
104-
uses: actions/setup-node@v1
31+
uses: actions/setup-node@v4
10532
with:
106-
node-version: 16
107-
- name: Install Dependencies
108-
run: yarn install --frozen-lockfile
109-
- name: Try Scenario
110-
run: yarn workspace ember-css-modules ember try:one ${{ matrix.scenario }}
111-
112-
test-packages:
113-
name: Test Packages
114-
runs-on: ubuntu-latest
115-
needs: [test-locked-deps]
116-
steps:
117-
- name: Checkout Code
118-
uses: actions/checkout@v1
119-
- name: Install Node
120-
uses: actions/setup-node@v1
33+
node-version-file: package.json
34+
- name: Load Cached Dependencies
35+
uses: actions/cache@v4
12136
with:
122-
node-version: 16
37+
enableCrossOsArchive: true
38+
path: |
39+
node_modules
40+
packages/*/node_modules
41+
test-packages/*/node_modules
42+
key: npm-${{ matrix.os }}-${{ hashFiles('yarn.lock') }}
43+
restore-keys:
44+
npm-${{ matrix.os }}-
45+
npm-
12346
- name: Install Dependencies
12447
run: yarn install --frozen-lockfile
125-
- name: Embroider App
126-
run: yarn workspace embroider-app test:ember
127-
- name: Sass App
128-
run: yarn workspace sass-app test:ember
129-
- name: Plugin Addon
130-
run: yarn workspace plugin-addon test:ember
131-
- name: Octane Addon
132-
run: yarn workspace octane-addon test
133-
- name: Octane Addon With Custom moduleName
134-
run: yarn workspace @my-namespace/octane-addon test
48+
- name: Build
49+
run: yarn build
50+
- name: '`glimmer-local-class-transform` tests'
51+
run: yarn workspace glimmer-local-class-transform test
52+
- name: '`rollup-plugin-preprocess-css-modules` tests'
53+
run: yarn workspace rollup-plugin-preprocess-css-modules test
54+
- name: v1 app with `ember-css-modules` and classic build
55+
run: yarn workspace app-v1-ecm test:ember
56+
- name: v1 app with `ember-css-modules` and `@embroider/webpack`
57+
env: { EMBROIDER: 'true' }
58+
run: yarn workspace app-v1-ecm test:ember
59+
- name: v1 app with `ember-local-class` and `ember-auto-import`
60+
run: yarn workspace app-v1-elc test:ember
61+
- name: v1 app with `ember-local-class` and `@embroider/webpack`
62+
env: { EMBROIDER: 'true' }
63+
run: yarn workspace app-v1-elc test:ember
64+
- name: v2 app
65+
run: yarn workspace app-v2 test:ember

CHANGELOG.md renamed to CHANGELOG_LEGACY.md

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,13 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/).
66

77
## Unreleased
88

9+
### Added
10+
- Migration guides for apps and addons moving from `ember-css-modules` to the standalone packages [#338](https://github.com/salsify/ember-css-modules/pull/338)
11+
12+
### Fixed
13+
- Handle `undefined`/`null`/empty string passed to `classNames()` runtime helper [#335](https://github.com/salsify/ember-css-modules/pull/335)
14+
- Drop unmapped class names in `classNames()` instead of passing them through, matching v2 behavior [#335](https://github.com/salsify/ember-css-modules/pull/335)
15+
916
## 2.1.1 (April 4, 2019)
1017
### Fixed
1118
- Remove usage of .original in Ember 5.9+ to fix deprecation warnings.

0 commit comments

Comments
 (0)