Skip to content

Commit

Permalink
chore(schematics): replace template line endings with platform specific
Browse files Browse the repository at this point in the history
  • Loading branch information
splincode committed Dec 25, 2024
1 parent 693ef90 commit b9cecc2
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 26 deletions.
2 changes: 2 additions & 0 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,8 @@ jobs:
- uses: actions/[email protected]
- uses: taiga-family/ci/actions/setup/[email protected]
- uses: taiga-family/ci/actions/setup/[email protected]
- run: node -e 'console.log(require("node:os"))'
- run: node -e 'console.log(require("node:os").EOL.charCodeAt())'
- run: npm test
- uses: codecov/[email protected]
if: ${{ matrix.os == 'ubuntu-latest' }}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ export function replaceTemplateLineEndings(
getActiveProject();

getSourceFiles(pattern).forEach((file) => {
file.replaceWithText(file.getFullText().replaceAll(/\r?\n/g, EOL));
file.replaceWithText(file.getFullText().replaceAll(/\r?\n|\r|\n/g, EOL));
});

fileSystem.commitEdits();
Expand Down
34 changes: 9 additions & 25 deletions projects/cdk/schematics/ng-update/v4/tests/replace-crlf.spec.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
import {EOL} from 'node:os';
import {join} from 'node:path';

import {HostTree} from '@angular-devkit/schematics';
Expand All @@ -16,34 +15,19 @@ import {createAngularJson} from '../../../utils/create-angular-json';

const collectionPath = join(__dirname, '../../../migration.json');

const COMPONENT_BEFORE = `\r\n
const COMPONENT_BEFORE = `
@Component({
standalone: true,
templateUrl: './test.template.html',
template: '',
})
export class Test {}\r\n`;

const COMPONENT_AFTER = `${EOL}
const COMPONENT_AFTER = `
@Component({
standalone: true,
templateUrl: './test.template.html',
template: '',
})
export class Test {}${EOL}`;

const TEMPLATE_BEFORE = '\r\n<p>Hello</p>\r\n';

const TEMPLATE_AFTER = `${EOL}<p>Hello</p>${EOL}`;

const PACKAGE_BEFORE =
'{"dependencies": {"@angular/core": "~13.0.0", "@taiga-ui/addon-commerce": "~3.42.0"}}\r\n';

const PACKAGE_AFTER = `{
"dependencies": {
"@angular/core": "~13.0.0",
"@taiga-ui/addon-commerce": "~3.42.0",
"@taiga-ui/event-plugins": "^4.2.3"
}
}${EOL}`;
export class Test {}\n`;

describe('ng-update', () => {
let host: UnitTestTree;
Expand All @@ -67,9 +51,7 @@ describe('ng-update', () => {
host,
);

expect(tree.readContent('test/app/test.template.html')).toEqual(TEMPLATE_AFTER);
expect(tree.readContent('test/app/test.component.ts')).toEqual(COMPONENT_AFTER);
expect(tree.readContent('package.json')).toEqual(PACKAGE_AFTER);
});

afterEach(() => {
Expand All @@ -80,6 +62,8 @@ describe('ng-update', () => {
function createMainFiles(): void {
createAngularJson();
createSourceFile('test/app/test.component.ts', COMPONENT_BEFORE);
createSourceFile('test/app/test.template.html', TEMPLATE_BEFORE);
createSourceFile('package.json', PACKAGE_BEFORE);
createSourceFile(
'package.json',
'{"dependencies": {"@angular/core": "~13.0.0", "@taiga-ui/addon-commerce": "~3.42.0"}}',
);
}

0 comments on commit b9cecc2

Please sign in to comment.