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
2 changes: 1 addition & 1 deletion packages/cli/src/migrations/rules/build-dist-docs.ts
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ export const buildDistDocsRule: MigrationRule = {

if (isTrue) {
if (propName === 'buildDist') {
targetTypesNeedingSkipInDev.push('dist-custom-elements', 'dist-hydrate-script');
targetTypesNeedingSkipInDev.push('dist', 'dist-custom-elements', 'dist-hydrate-script');
} else if (propName === 'buildDocs') {
targetTypesNeedingSkipInDev.push(
'docs-readme',
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -39,8 +39,9 @@ describe('validateDistOutputTarget', () => {
typesDir: join(rootDir, 'my-dist', 'types'),
transformAliasedImportPathsInCollection: true,
isPrimaryPackageOutputTarget: false,
skipInDev: false,
skipInDev: true,
},

{
esmDir: join(rootDir, 'my-dist', 'my-build', 'testing'),
empty: false,
Expand All @@ -57,40 +58,6 @@ describe('validateDistOutputTarget', () => {
file: join(rootDir, 'my-dist', 'my-build', 'testing', 'testing.css'),
type: 'dist-global-styles',
},
{
dir: join(rootDir, 'my-dist'),
type: 'dist-types',
typesDir: join(rootDir, 'my-dist', 'types'),
},
{
collectionDir: join(rootDir, 'my-dist', 'collection'),
dir: join(rootDir, '/my-dist'),
empty: false,
transformAliasedImportPaths: true,
type: 'dist-collection',
},
{
copy: [{ src: '**/*.svg' }, { src: '**/*.js' }],
copyAssets: 'collection',
dir: join(rootDir, 'my-dist', 'collection'),
type: 'copy',
},
{
type: 'dist-lazy',
cjsDir: join(rootDir, 'my-dist', 'cjs'),
cjsIndexFile: join(rootDir, 'my-dist', 'index.cjs.js'),
empty: false,
esmDir: join(rootDir, 'my-dist', 'esm'),
esmIndexFile: join(rootDir, 'my-dist', 'index.js'),
},
{
cjsDir: join(rootDir, 'my-dist', 'cjs'),
componentDts: join(rootDir, 'my-dist', 'types', 'components.d.ts'),
dir: join(rootDir, 'my-dist', 'loader'),
empty: false,
esmDir: join(rootDir, 'my-dist', 'esm'),
type: 'dist-lazy-loader',
},
]);
});

Expand Down Expand Up @@ -135,7 +102,7 @@ describe('validateDistOutputTarget', () => {
typesDir: join(rootDir, 'my-dist', 'types'),
transformAliasedImportPathsInCollection: true,
isPrimaryPackageOutputTarget: false,
skipInDev: false,
skipInDev: true,
},
{
esmDir: join(rootDir, 'my-dist', 'my-build', 'testing'),
Expand All @@ -153,40 +120,6 @@ describe('validateDistOutputTarget', () => {
file: join(rootDir, 'my-dist', 'my-build', 'testing', 'testing.css'),
type: 'dist-global-styles',
},
{
dir: join(rootDir, 'my-dist'),
type: 'dist-types',
typesDir: join(rootDir, 'my-dist', 'types'),
},
{
collectionDir: join(rootDir, 'my-dist', 'collection'),
dir: join(rootDir, '/my-dist'),
empty: false,
transformAliasedImportPaths: true,
type: 'dist-collection',
},
{
copy: [{ src: '**/*.svg' }, { src: '**/*.js' }],
copyAssets: 'collection',
dir: join(rootDir, 'my-dist', 'collection'),
type: 'copy',
},
{
type: 'dist-lazy',
cjsDir: join(rootDir, 'my-dist', 'cjs'),
cjsIndexFile: join(rootDir, 'my-dist', 'index.cjs.js'),
empty: false,
esmDir: join(rootDir, 'my-dist', 'esm'),
esmIndexFile: join(rootDir, 'my-dist', 'index.js'),
},
{
cjsDir: join(rootDir, 'my-dist', 'cjs'),
componentDts: join(rootDir, 'my-dist', 'types', 'components.d.ts'),
dir: join(rootDir, 'my-dist', 'loader'),
empty: false,
esmDir: join(rootDir, 'my-dist', 'esm'),
type: 'dist-lazy-loader',
},
]);
});

Expand Down Expand Up @@ -215,7 +148,7 @@ describe('validateDistOutputTarget', () => {
typesDir: join(rootDir, 'my-dist', 'types'),
transformAliasedImportPathsInCollection: true,
isPrimaryPackageOutputTarget: true,
skipInDev: false,
skipInDev: true,
},
{
esmDir: join(rootDir, 'my-dist', 'my-build', 'testing'),
Expand All @@ -233,40 +166,6 @@ describe('validateDistOutputTarget', () => {
file: join(rootDir, 'my-dist', 'my-build', 'testing', 'testing.css'),
type: 'dist-global-styles',
},
{
dir: join(rootDir, 'my-dist'),
type: 'dist-types',
typesDir: join(rootDir, 'my-dist', 'types'),
},
{
collectionDir: join(rootDir, 'my-dist', 'collection'),
dir: join(rootDir, '/my-dist'),
empty: false,
transformAliasedImportPaths: true,
type: 'dist-collection',
},
{
copy: [{ src: '**/*.svg' }, { src: '**/*.js' }],
copyAssets: 'collection',
dir: join(rootDir, 'my-dist', 'collection'),
type: 'copy',
},
{
type: 'dist-lazy',
cjsDir: join(rootDir, 'my-dist', 'cjs'),
cjsIndexFile: join(rootDir, 'my-dist', 'index.cjs.js'),
empty: false,
esmDir: join(rootDir, 'my-dist', 'esm'),
esmIndexFile: join(rootDir, 'my-dist', 'index.js'),
},
{
cjsDir: join(rootDir, 'my-dist', 'cjs'),
componentDts: join(rootDir, 'my-dist', 'types', 'components.d.ts'),
dir: join(rootDir, 'my-dist', 'loader'),
empty: false,
esmDir: join(rootDir, 'my-dist', 'esm'),
type: 'dist-lazy-loader',
},
]);
});
});
4 changes: 2 additions & 2 deletions packages/core/src/compiler/config/outputs/validate-dist.ts
Original file line number Diff line number Diff line change
Expand Up @@ -145,8 +145,8 @@ const validateOutputTargetDist = (
: true,
isPrimaryPackageOutputTarget: o.isPrimaryPackageOutputTarget ?? false,
cjs: isBoolean(o.cjs) ? o.cjs : false,
// dist always builds by default (skipInDev: false)
skipInDev: isBoolean(o.skipInDev) ? o.skipInDev : false,
// dist skips distribution artifacts in dev mode by default, but always builds browser/CDN output
skipInDev: isBoolean(o.skipInDev) ? o.skipInDev : true,
} satisfies Required<d.OutputTargetDist>;

if (!isAbsolute(outputTarget.buildDir)) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ function setup(configOverrides: Partial<d.ValidatedConfig> = {}) {
type: DIST,
dir: 'my-test-dir',
cjs: true,
skipInDev: false,
},
],
srcDir: '/src',
Expand Down
Loading