Skip to content

Commit 9301407

Browse files
Merge pull request #21188 from emberjs/nvp/prettier-smoke-tests
Get @glimmer/syntax publishable again and get some smoke tests going for prettier
2 parents 3707cd9 + 6b70b33 commit 9301407

File tree

4 files changed

+119
-12
lines changed

4 files changed

+119
-12
lines changed
Lines changed: 68 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,68 @@
1+
# aka: our primary CLI-land consumer of @glimmer/syntax
2+
name: "Prettier Smoke Test"
3+
4+
on:
5+
push:
6+
branches:
7+
- main
8+
- beta
9+
- release
10+
- release*
11+
- lts*
12+
paths:
13+
- ".github/workflows/glimmer-syntax-prettier-smoke-test.yml"
14+
- ".github/actions/setup/**"
15+
- "rollup.config.mjs"
16+
- "packages/@glimmer/syntax/**"
17+
- "packages/@glimmer/interfaces/**"
18+
- "packages/@glimmer/util/**"
19+
- "packages/@glimmer/wire-format/**"
20+
- "packages/@handlebars/parser/**"
21+
pull_request:
22+
paths:
23+
- ".github/workflows/glimmer-syntax-prettier-smoke-test.yml"
24+
- ".github/actions/setup/**"
25+
- "rollup.config.mjs"
26+
- "packages/@glimmer/syntax/**"
27+
- "packages/@glimmer/interfaces/**"
28+
- "packages/@glimmer/util/**"
29+
- "packages/@glimmer/wire-format/**"
30+
- "packages/@handlebars/parser/**"
31+
workflow_dispatch:
32+
33+
permissions:
34+
contents: read
35+
36+
jobs:
37+
prettier-smoke-test:
38+
name: Prettier handlebars smoke test
39+
runs-on: ubuntu-latest
40+
steps:
41+
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
42+
with:
43+
persist-credentials: false
44+
- uses: ./.github/actions/setup
45+
- run: pnpm build
46+
47+
- name: Pack @glimmer/syntax
48+
working-directory: packages/@glimmer/syntax
49+
run: pnpm pack --out ${{ github.workspace }}/glimmer-syntax.tgz
50+
51+
- name: Checkout prettier/prettier
52+
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
53+
with:
54+
persist-credentials: false
55+
repository: prettier/prettier
56+
path: prettier-repo
57+
58+
- name: Install prettier dependencies
59+
working-directory: prettier-repo
60+
run: yarn install
61+
62+
- name: Install local @glimmer/syntax into prettier
63+
working-directory: prettier-repo
64+
run: yarn add "@glimmer/syntax@file:${{ github.workspace }}/glimmer-syntax.tgz"
65+
66+
- name: Run prettier handlebars tests
67+
working-directory: prettier-repo
68+
run: yarn jest tests/format/handlebars

package.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -295,6 +295,7 @@
295295
"@ember/template-compiler/lib/-internal/primitives.js": "ember-source/@ember/template-compiler/lib/-internal/primitives.js",
296296
"@ember/template-compiler/lib/compile-options.js": "ember-source/@ember/template-compiler/lib/compile-options.js",
297297
"@ember/template-compiler/lib/dasherize-component-name.js": "ember-source/@ember/template-compiler/lib/dasherize-component-name.js",
298+
"@ember/template-compiler/lib/plugins/allowed-globals.js": "ember-source/@ember/template-compiler/lib/plugins/allowed-globals.js",
298299
"@ember/template-compiler/lib/plugins/assert-against-attrs.js": "ember-source/@ember/template-compiler/lib/plugins/assert-against-attrs.js",
299300
"@ember/template-compiler/lib/plugins/assert-against-named-outlets.js": "ember-source/@ember/template-compiler/lib/plugins/assert-against-named-outlets.js",
300301
"@ember/template-compiler/lib/plugins/assert-input-helper-without-block.js": "ember-source/@ember/template-compiler/lib/plugins/assert-input-helper-without-block.js",
@@ -390,4 +391,4 @@
390391
}
391392
},
392393
"packageManager": "pnpm@10.30.3"
393-
}
394+
}

packages/@glimmer/syntax/package.json

Lines changed: 4 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -16,17 +16,11 @@
1616
"access": "public",
1717
"exports": {
1818
".": {
19-
"development": {
20-
"types": "./dist/dev/index.d.ts",
21-
"default": "./dist/dev/index.js"
19+
"node": {
20+
"require": "./dist/cjs/index.cjs",
21+
"import": "./dist/es/index.js"
2222
},
23-
"require": {
24-
"default": "./dist/dev/index.cjs"
25-
},
26-
"default": {
27-
"types": "./dist/prod/index.d.ts",
28-
"default": "./dist/prod/index.js"
29-
}
23+
"default": "./dist/es/index.js"
3024
}
3125
},
3226
"types": "dist/dev/index.d.ts"
@@ -35,7 +29,6 @@
3529
"dist"
3630
],
3731
"scripts": {
38-
"prepack": "rollup -c rollup.config.mjs",
3932
"test:publint": "publint"
4033
},
4134
"dependencies": {

rollup.config.mjs

Lines changed: 45 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,8 @@ let configs = [
4242
}),
4343
templateCompilerConfig(),
4444
glimmerComponent(),
45+
glimmerSyntaxESM(),
46+
glimmerSyntaxCJS(),
4547
];
4648

4749
if (process.env.DEBUG_SINGLE_CONFIG) {
@@ -116,6 +118,49 @@ function sharedESMConfig({ input, debugMacrosMode }) {
116118
};
117119
}
118120

121+
function glimmerSyntaxESM() {
122+
return {
123+
onLog: handleRollupWarnings,
124+
input: './packages/@glimmer/syntax/index.ts',
125+
output: {
126+
format: 'es',
127+
file: 'packages/@glimmer/syntax/dist/es/index.js',
128+
hoistTransitiveImports: false,
129+
},
130+
plugins: [
131+
babel({
132+
babelHelpers: 'bundled',
133+
extensions: ['.js', '.ts'],
134+
configFile: false,
135+
...sharedBabelConfig,
136+
}),
137+
resolveTS(),
138+
resolvePackages({ ...exposedDependencies(), ...hiddenDependencies() }),
139+
],
140+
};
141+
}
142+
function glimmerSyntaxCJS() {
143+
return {
144+
onLog: handleRollupWarnings,
145+
input: './packages/@glimmer/syntax/index.ts',
146+
output: {
147+
format: 'cjs',
148+
file: 'packages/@glimmer/syntax/dist/cjs/index.cjs',
149+
hoistTransitiveImports: false,
150+
},
151+
plugins: [
152+
babel({
153+
babelHelpers: 'bundled',
154+
extensions: ['.js', '.ts'],
155+
configFile: false,
156+
...sharedBabelConfig,
157+
}),
158+
resolveTS(),
159+
resolvePackages({ ...exposedDependencies(), ...hiddenDependencies() }),
160+
],
161+
};
162+
}
163+
119164
function glimmerComponent() {
120165
return {
121166
onLog: handleRollupWarnings,

0 commit comments

Comments
 (0)