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
11 changes: 7 additions & 4 deletions packages/@glimmer/component/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,12 @@
"version": "2.1.1",
"description": "Glimmer component library",
"exports": {
".": "./dist/index.js",
"./*": "./*.ts"
".": {
"types": "./dist/component/src/index.d.ts",
"development": "./dist/dev/index.js",
"production": "./dist/prod/index.js",
Comment on lines +8 to +9

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.

aren't these a bit generic? I think by default Vite is setting development in dev mode. If we're going to add something like this we shouldn't be doing this in the same PR that is fixing a breaking deployment

"default": "./dist/prod/index.js"
}
},
"keywords": [
"ember-addon"
Expand All @@ -18,8 +22,7 @@
"repository": "https://github.com/emberjs/ember.js",
"scripts": {},
"dependencies": {
"@embroider/addon-shim": "^1.10.2",
"@glimmer/env": "workspace:*"
"@embroider/addon-shim": "^1.10.2"
},
"devDependencies": {
"@ember/component": "workspace:*",
Expand Down
3 changes: 2 additions & 1 deletion packages/@glimmer/component/tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,8 @@
"@ember/owner": ["../../../types/stable/@ember/owner/index.d.ts"],
"@ember/destroyable": ["../../../types/stable/@ember/destroyable/index.d.ts"],
"@ember/component": ["../../../types/stable/@ember/component/index.d.ts"],
"@ember/runloop": ["../../../types/stable/@ember/runloop/index.d.ts"]
"@ember/runloop": ["../../../types/stable/@ember/runloop/index.d.ts"],
"@glimmer/env": ["../env/index.ts"]

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.

so is this now lying? it's not got a dependency on @glimmer/env but it's still using the types from it? I don't understand why we need this to be added if we're truely removing the dependency 🤔

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.

it's types for build flags -- we removed the dep, but we still need type-checking to pass, and we compile it away

},
"target": "esnext",
"module": "esnext",
Expand Down
3 changes: 0 additions & 3 deletions pnpm-lock.yaml

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

14 changes: 10 additions & 4 deletions rollup.config.mjs
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,8 @@ const testDependencies = [
let configs = [
esmConfig(),
esmProdConfig(),
glimmerComponent(),
glimmerComponent({ prod: false }),
glimmerComponent({ prod: true }),
glimmerSyntaxESM(),
glimmerSyntaxCJS(),
];
Expand Down Expand Up @@ -168,15 +169,19 @@ function glimmerSyntaxCJS() {
};
}

function glimmerComponent() {
function glimmerComponent({ prod }) {
let babelConfig = { ...sharedBabelConfig };
let outputDir = prod ? 'dist/prod' : 'dist/dev';
let isDebug = !prod;

return {
onLog: handleRollupWarnings,
input: {
index: './packages/@glimmer/component/src/index.ts',
},
output: {
format: 'es',
dir: 'packages/@glimmer/component/dist',
dir: `packages/@glimmer/component/${outputDir}`,
hoistTransitiveImports: false,
generatedCode: 'es2015',
},
Expand All @@ -185,7 +190,8 @@ function glimmerComponent() {
babelHelpers: 'bundled',
extensions: ['.js', '.ts'],
configFile: false,
...sharedBabelConfig,
...babelConfig,
plugins: [...babelConfig.plugins, ...buildDebugMacroPlugin(isDebug)],
}),
resolveTS(),
externalizePackages({ ...exposedDependencies(), ...hiddenDependencies() }),
Expand Down
6 changes: 5 additions & 1 deletion tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,11 @@
"extends": "./tsconfig/compiler-options.json",
"compilerOptions": {
"outDir": "dist",
"noEmit": true
"noEmit": true,
"paths": {
// We compile away @glimmer/env during all our builds
"@glimmer/env": ["./packages/@glimmer/env/index.ts"]
}
},
"include": ["packages/**/*.ts"],
"exclude": ["dist", "node_modules", "tmp", "types"]
Expand Down
Loading