Skip to content

Commit

Permalink
Fix CI
Browse files Browse the repository at this point in the history
  • Loading branch information
Mati365 committed Nov 4, 2024
1 parent 636b541 commit 7291de0
Show file tree
Hide file tree
Showing 5 changed files with 19 additions and 25 deletions.
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
"coverage": "ng test --watch=false --code-coverage",
"lint": "eslint \"*/**/*.+(js|mjs|ts)\"",
"changelog": "node ./scripts/changelog.mjs",
"build-package": "ng-packagr -p src/ckeditor/ng-package.json",
"build-package": "ng-packagr -p src/ckeditor/ng-package.json --config tsconfig.json",
"release:prepare-packages": "node scripts/preparepackages.mjs",
"release:publish-packages": "node scripts/publishpackages.mjs"
},
Expand Down
28 changes: 14 additions & 14 deletions scripts/preparepackages.mjs
Original file line number Diff line number Diff line change
Expand Up @@ -69,22 +69,10 @@ const tasks = new Listr( [
}
},
{
title: 'Generating the `dist` directory.',
task: () => {
return devUtils.tools.shExec( 'yarn run build-package', { async: true, verbosity: 'silent' } );
}
},
{
title: 'Copying dist to release directory.',
task: () => {
return fs.copy( DIST_DIR, RELEASE_ANGULAR_DIR );
}
},
{
title: 'Updating the `#version` field in the `package.json` in the release directory',
title: 'Updating the `#version` field in the `package.json` in the source directory',
task: () => {
return devUtils.tools.updateJSONFile(
upath.join( RELEASE_ANGULAR_DIR, 'package.json' ),
upath.join( CKEDITOR5_ANGULAR_ROOT_DIR, 'src', 'ckeditor', 'package.json' ),
packageJson => {
packageJson.version = latestVersion;

Expand All @@ -100,6 +88,18 @@ const tasks = new Listr( [
return false;
}
},
{
title: 'Generating the `dist` directory.',
task: () => {
return devUtils.tools.shExec( 'yarn run build-package', { async: true, verbosity: 'silent' } );
}
},
{
title: 'Copying dist to release directory.',
task: () => {
return fs.copy( DIST_DIR, RELEASE_ANGULAR_DIR );
}
},
{
title: 'Copying required assets to the release directory.',
task: () => {
Expand Down
4 changes: 2 additions & 2 deletions src/ckeditor/plugins/angular-integration-usage-data.plugin.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

import { VERSION } from '@angular/core';
import { createIntegrationUsageDataPlugin } from '@ckeditor/ckeditor5-integrations-common';
import { environment } from '../../environments/environment';
import { version } from '../package.json';

/**
* This part of the code is not executed in open-source implementations using a GPL key.
Expand All @@ -15,7 +15,7 @@ import { environment } from '../../environments/environment';
export const AngularIntegrationUsageDataPlugin = createIntegrationUsageDataPlugin(
'angular',
{
version: environment.appVersion,
version,
frameworkVersion: VERSION.full
}
);
5 changes: 1 addition & 4 deletions src/environments/environment.prod.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,3 @@
import { version } from '../ckeditor/package.json';

export const environment = {
production: true,
appVersion: version
production: true
};
5 changes: 1 addition & 4 deletions src/environments/environment.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,6 @@
// `ng build --env=prod` then `environment.prod.ts` will be used instead.
// The list of which env maps to which file can be found in `.angular-cli.json`.

import pkg from '../../package.json';

export const environment = {
production: false,
appVersion: pkg.version
production: false
};

0 comments on commit 7291de0

Please sign in to comment.