Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
68 changes: 68 additions & 0 deletions .github/workflows/glimmer-syntax-prettier-smoke-test.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,68 @@
# aka: our primary CLI-land consumer of @glimmer/syntax
name: "Prettier Smoke Test"

on:
push:
branches:
- main
- beta
- release
- release*
- lts*
paths:
- ".github/workflows/glimmer-syntax-prettier-smoke-test.yml"
- ".github/actions/setup/**"
- "rollup.config.mjs"
- "packages/@glimmer/syntax/**"
- "packages/@glimmer/interfaces/**"
- "packages/@glimmer/util/**"
- "packages/@glimmer/wire-format/**"
- "packages/@handlebars/parser/**"
pull_request:
paths:
- ".github/workflows/glimmer-syntax-prettier-smoke-test.yml"
- ".github/actions/setup/**"
- "rollup.config.mjs"
- "packages/@glimmer/syntax/**"
- "packages/@glimmer/interfaces/**"
- "packages/@glimmer/util/**"
- "packages/@glimmer/wire-format/**"
- "packages/@handlebars/parser/**"
workflow_dispatch:

permissions:
contents: read

jobs:
prettier-smoke-test:
name: Prettier handlebars smoke test
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
with:
persist-credentials: false
- uses: ./.github/actions/setup
- run: pnpm build

- name: Pack @glimmer/syntax
working-directory: packages/@glimmer/syntax
run: pnpm pack --out ${{ github.workspace }}/glimmer-syntax.tgz

- name: Checkout prettier/prettier
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
with:
persist-credentials: false
repository: prettier/prettier
path: prettier-repo

- name: Install prettier dependencies
working-directory: prettier-repo
run: yarn install

- name: Install local @glimmer/syntax into prettier
working-directory: prettier-repo
run: yarn add "@glimmer/syntax@file:${{ github.workspace }}/glimmer-syntax.tgz"

- name: Run prettier handlebars tests
working-directory: prettier-repo
run: yarn jest tests/format/handlebars
3 changes: 2 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -295,6 +295,7 @@
"@ember/template-compiler/lib/-internal/primitives.js": "ember-source/@ember/template-compiler/lib/-internal/primitives.js",
"@ember/template-compiler/lib/compile-options.js": "ember-source/@ember/template-compiler/lib/compile-options.js",
"@ember/template-compiler/lib/dasherize-component-name.js": "ember-source/@ember/template-compiler/lib/dasherize-component-name.js",
"@ember/template-compiler/lib/plugins/allowed-globals.js": "ember-source/@ember/template-compiler/lib/plugins/allowed-globals.js",
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This expected?

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

yea, it should have been on main -- we should probably have a lint that catches this

"@ember/template-compiler/lib/plugins/assert-against-attrs.js": "ember-source/@ember/template-compiler/lib/plugins/assert-against-attrs.js",
"@ember/template-compiler/lib/plugins/assert-against-named-outlets.js": "ember-source/@ember/template-compiler/lib/plugins/assert-against-named-outlets.js",
"@ember/template-compiler/lib/plugins/assert-input-helper-without-block.js": "ember-source/@ember/template-compiler/lib/plugins/assert-input-helper-without-block.js",
Expand Down Expand Up @@ -390,4 +391,4 @@
}
},
"packageManager": "[email protected]"
}
}
15 changes: 4 additions & 11 deletions packages/@glimmer/syntax/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,17 +16,11 @@
"access": "public",
"exports": {
".": {
"development": {
"types": "./dist/dev/index.d.ts",
"default": "./dist/dev/index.js"
"node": {
"require": "./dist/cjs/index.cjs",
"import": "./dist/es/index.js"
},
"require": {
"default": "./dist/dev/index.cjs"
},
"default": {
"types": "./dist/prod/index.d.ts",
"default": "./dist/prod/index.js"
}
"default": "./dist/es/index.js"
}
},
"types": "dist/dev/index.d.ts"
Expand All @@ -35,7 +29,6 @@
"dist"
],
"scripts": {
"prepack": "rollup -c rollup.config.mjs",
"test:publint": "publint"
},
"dependencies": {
Expand Down
45 changes: 45 additions & 0 deletions rollup.config.mjs
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,8 @@ let configs = [
}),
templateCompilerConfig(),
glimmerComponent(),
glimmerSyntaxESM(),
glimmerSyntaxCJS(),
];

if (process.env.DEBUG_SINGLE_CONFIG) {
Expand Down Expand Up @@ -116,6 +118,49 @@ function sharedESMConfig({ input, debugMacrosMode }) {
};
}

function glimmerSyntaxESM() {
return {
onLog: handleRollupWarnings,
input: './packages/@glimmer/syntax/index.ts',
output: {
format: 'es',
file: 'packages/@glimmer/syntax/dist/es/index.js',
hoistTransitiveImports: false,
},
plugins: [
babel({
babelHelpers: 'bundled',
extensions: ['.js', '.ts'],
configFile: false,
...sharedBabelConfig,
}),
resolveTS(),
resolvePackages({ ...exposedDependencies(), ...hiddenDependencies() }),
],
};
}
function glimmerSyntaxCJS() {
return {
onLog: handleRollupWarnings,
input: './packages/@glimmer/syntax/index.ts',
output: {
format: 'cjs',
file: 'packages/@glimmer/syntax/dist/cjs/index.cjs',
hoistTransitiveImports: false,
},
plugins: [
babel({
babelHelpers: 'bundled',
extensions: ['.js', '.ts'],
configFile: false,
...sharedBabelConfig,
}),
resolveTS(),
resolvePackages({ ...exposedDependencies(), ...hiddenDependencies() }),
],
};
}

function glimmerComponent() {
return {
onLog: handleRollupWarnings,
Expand Down