Skip to content

Commit

Permalink
Downstreamed changes from @embroider/addon-blueprint@2.7.0 (#215)
Browse files Browse the repository at this point in the history
* chore: Downstreamed changes from @embroider/addon-blueprint@2.7.0

* chore: Added lockfile

* chore: Removed .gitkeep

---------

Co-authored-by: ijlee2 <ijlee2@users.noreply.github.com>
  • Loading branch information
ijlee2 and ijlee2 authored Nov 7, 2023
1 parent 1f1556b commit 2d2fb93
Show file tree
Hide file tree
Showing 5 changed files with 52 additions and 47 deletions.
18 changes: 16 additions & 2 deletions ember-container-query/babel.config.json
Original file line number Diff line number Diff line change
@@ -1,8 +1,22 @@
{
"presets": [["@babel/preset-typescript"]],
"plugins": [
[
"@babel/plugin-transform-typescript",
{
"allExtensions": true,
"allowDeclareFields": true,
"onlyRemoveTypeImports": true
}
],
"@embroider/addon-dev/template-colocation-plugin",
["@babel/plugin-transform-typescript", { "allowDeclareFields": true }],
"@babel/plugin-transform-class-static-block",
[
"babel-plugin-ember-template-compilation",
{
"targetFormat": "hbs",
"transforms": []
}
],
["@babel/plugin-proposal-decorators", { "version": "legacy" }],
"@babel/plugin-transform-class-properties"
]
Expand Down
4 changes: 3 additions & 1 deletion ember-container-query/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,8 @@
"@babel/core": "^7.23.2",
"@babel/plugin-proposal-decorators": "^7.23.2",
"@babel/plugin-transform-class-properties": "^7.22.5",
"@babel/preset-typescript": "^7.23.2",
"@babel/plugin-transform-class-static-block": "^7.22.11",
"@babel/plugin-transform-typescript": "^7.22.15",
"@babel/runtime": "^7.23.2",
"@embroider/addon-dev": "^4.1.1",
"@gavant/glint-template-types": "^0.3.6",
Expand All @@ -95,6 +96,7 @@
"@types/ember__owner": "^4.0.8",
"@types/ember__runloop": "^4.0.7",
"@types/ember__service": "^4.0.6",
"babel-plugin-ember-template-compilation": "^2.2.1",
"concurrently": "^8.2.2",
"ember-template-lint": "^5.12.0",
"eslint": "^8.53.0",
Expand Down
29 changes: 14 additions & 15 deletions ember-container-query/rollup.config.mjs
Original file line number Diff line number Diff line change
Expand Up @@ -15,25 +15,21 @@ export default {
plugins: [
// These are the modules that users should be able to import from your
// addon. Anything not listed here may get optimized away.
addon.publicEntrypoints([
'components/container-query.js',
'helpers/aspect-ratio.js',
'helpers/height.js',
'helpers/width.js',
'index.js',
'modifiers/container-query.js',
'template-registry.js',
]),
// By default all your JavaScript modules (**/*.js) will be importable.
// But you are encouraged to tweak this to only cover the modules that make
// up your addon's public API. Also make sure your package.json#exports
// is aligned to the config here.
// See https://github.com/embroider-build/embroider/blob/main/docs/v2-faq.md#how-can-i-define-the-public-exports-of-my-addon
addon.publicEntrypoints(['**/*.js', 'index.js', 'template-registry.js']),

// These are the modules that should get reexported into the traditional
// "app" tree. Things in here should also be in publicEntrypoints above, but
// not everything in publicEntrypoints necessarily needs to go here.
addon.appReexports([
'components/container-query.js',
'helpers/aspect-ratio.js',
'helpers/height.js',
'helpers/width.js',
'modifiers/container-query.js',
'components/**/*.js',
'helpers/**/*.js',
'modifiers/**/*.js',
'services/**/*.js',
]),

// Follow the V2 Addon rules about dependencies. Your code can import from
Expand All @@ -49,12 +45,15 @@ export default {
// babel.config.json.
babel({
babelHelpers: 'bundled',
extensions: ['.js', '.ts'],
extensions: ['.gjs', '.gts', '.js', '.ts'],
}),

// Ensure that standalone .hbs files are properly integrated as Javascript.
addon.hbs(),

// Ensure that .gjs files are properly integrated as Javascript
addon.gjs(),

// addons are allowed to contain imports of .css files, which we want rollup
// to leave alone and keep in the published output.
addon.keepAssets(['**/*.css']),
Expand Down
Empty file removed ember-container-query/src/.gitkeep
Empty file.
48 changes: 19 additions & 29 deletions pnpm-lock.yaml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit 2d2fb93

Please sign in to comment.