Skip to content

Commit 03bc14a

Browse files
filipesilvaBrocco
authored andcommitted
fix(@angular-devkit/build-optimizer): update regex to allow new cases
Follow up to #193 Fix #184
1 parent 2d07d46 commit 03bc14a

File tree

2 files changed

+12
-3
lines changed

2 files changed

+12
-3
lines changed

packages/angular_devkit/build_optimizer/src/transforms/prefix-classes.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@ import * as ts from 'typescript';
1212
export function testPrefixClasses(content: string) {
1313
const regexes = [
1414
// tslint:disable-next-line:max-line-length
15-
/^(var (\S+) = )(\(function \(\) \{\r?\n(?: (?:\/\*\*| \*|\*\/|\/\/)[^\r?\n]*\r?\n)* function \2\([^\)]*\) \{\r?\n)/,
16-
/^(var (\S+) = )(\(function \(_super\) \{\r?\n \w*__extends\(\w+, _super\);\r?\n)/,
15+
/^(?:export )?(var (\S+) = )(?:\/\*\* @class \*\/ )?(\(function \(\) \{\r?\n(?:\s+(?:\/\*\*| \*|\*\/|\/\/)[^\r?\n]*\r?\n)*\s+function \2\([^\)]*\) \{\r?\n)/,
16+
/^(?:export )?(var (\S+) = )(?:\/\*\* @class \*\/ )?(\(function \(_super\) \{\r?\n\s+\w*__extends\(\w+, _super\);\r?\n)/,
1717
];
1818

1919
return regexes.some((regex) => regex.test(content));

packages/angular_devkit/build_optimizer/src/transforms/prefix-classes_spec.ts

+10-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
*/
88
import { tags } from '@angular-devkit/core';
99
import { transformJavascript } from '../helpers/transform-javascript';
10-
import { getPrefixClassesTransformer } from './prefix-classes';
10+
import { getPrefixClassesTransformer, testPrefixClasses } from './prefix-classes';
1111

1212

1313
const transform = (content: string) => transformJavascript(
@@ -30,6 +30,7 @@ describe('prefix-classes', () => {
3030
}());
3131
`;
3232

33+
expect(testPrefixClasses(input)).toBeTruthy();
3334
expect(tags.oneLine`${transform(input)}`).toEqual(tags.oneLine`${output}`);
3435
});
3536

@@ -54,6 +55,7 @@ describe('prefix-classes', () => {
5455
}());
5556
`;
5657

58+
expect(testPrefixClasses(input)).toBeTruthy();
5759
expect(tags.oneLine`${transform(input)}`).toEqual(tags.oneLine`${output}`);
5860
});
5961

@@ -77,6 +79,7 @@ describe('prefix-classes', () => {
7779
}(StaticTestCase));
7880
`;
7981

82+
expect(testPrefixClasses(input)).toBeTruthy();
8083
expect(tags.oneLine`${transform(input)}`).toEqual(tags.oneLine`${output}`);
8184
});
8285

@@ -98,6 +101,7 @@ describe('prefix-classes', () => {
98101
StaticTestCase.StaticTest = true;
99102
`;
100103

104+
expect(testPrefixClasses(input)).toBeTruthy();
101105
expect(tags.oneLine`${transform(input)}`).toEqual(tags.oneLine`${output}`);
102106
});
103107

@@ -121,6 +125,7 @@ describe('prefix-classes', () => {
121125
}(StaticTestCase));
122126
`;
123127

128+
expect(testPrefixClasses(input)).toBeTruthy();
124129
expect(tags.oneLine`${transform(input)}`).toEqual(tags.oneLine`${output}`);
125130
});
126131

@@ -142,6 +147,7 @@ describe('prefix-classes', () => {
142147
}());
143148
`;
144149

150+
expect(testPrefixClasses(input)).toBeTruthy();
145151
expect(tags.oneLine`${transform(input)}`).toEqual(tags.oneLine`${output}`);
146152
});
147153

@@ -161,6 +167,7 @@ describe('prefix-classes', () => {
161167
}());
162168
`;
163169

170+
expect(testPrefixClasses(input)).toBeTruthy();
164171
expect(tags.oneLine`${transform(input)}`).toEqual(tags.oneLine`${output}`);
165172
});
166173

@@ -182,6 +189,7 @@ describe('prefix-classes', () => {
182189
}());
183190
`;
184191

192+
expect(testPrefixClasses(input)).toBeTruthy();
185193
expect(tags.oneLine`${transform(input)}`).toEqual(tags.oneLine`${output}`);
186194
});
187195

@@ -205,6 +213,7 @@ describe('prefix-classes', () => {
205213
}(StaticTestCase));
206214
`;
207215

216+
expect(testPrefixClasses(input)).toBeTruthy();
208217
expect(tags.oneLine`${transform(input)}`).toEqual(tags.oneLine`${output}`);
209218
});
210219

0 commit comments

Comments
 (0)