Skip to content

Commit b2ae3f4

Browse files
crisbetojelbourn
authored andcommitted
build: clean up build workaround for ts 2.9 (#12912)
Removes a workaround that was initially introduced to get #12182 through. The root issue has been resolved in #12876.
1 parent b2d74e1 commit b2ae3f4

File tree

1 file changed

+2
-17
lines changed

1 file changed

+2
-17
lines changed

tools/gulp/tasks/e2e.ts

Lines changed: 2 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
1-
import {task, src, dest} from 'gulp';
1+
import {task} from 'gulp';
22
import {join} from 'path';
33
import {ngcBuildTask, copyTask, execNodeTask, serverTask} from '../util/task_helpers';
44
import {copySync} from 'fs-extra';
55
import {buildConfig, sequenceTask, triggerLivereload, watchFiles} from 'material2-build-tools';
6-
import {sync as globSync} from 'glob';
76

87
// There are no type definitions available for these imports.
98
const gulpConnect = require('gulp-connect');
@@ -69,7 +68,7 @@ task('e2e-app:build', sequenceTask(
6968
'material-moment-adapter:build-release',
7069
'material-examples:build-release'
7170
],
72-
['e2e-app:copy-release', 'e2e-app:copy-typings', 'e2e-app:copy-assets'],
71+
['e2e-app:copy-release', 'e2e-app:copy-assets'],
7372
'e2e-app:build-ts'
7473
));
7574

@@ -115,17 +114,3 @@ task('e2e-app:copy-release', () => {
115114
copySync(join(releasesDir, 'material-examples'), join(outDir, 'material-examples'));
116115
copySync(join(releasesDir, 'material-moment-adapter'), join(outDir, 'material-moment-adapter'));
117116
});
118-
119-
// Copy the core declaration files next to the declarations of each module. This is a workaround
120-
// for an issue in TypeScript 2.9 where the generated declaration files have wrong import paths.
121-
// We should be able to remove this task once we update to TypeScript 3.0.
122-
// See: https://github.com/Microsoft/TypeScript/issues/25511.
123-
task('e2e-app:copy-typings', () => {
124-
const stream = src(join(outDir, 'material/core/typings/*/**'));
125-
126-
globSync(join(outDir, 'material/!(core)/')).forEach(directory => {
127-
stream.pipe(dest(join(directory, 'core')));
128-
});
129-
130-
return stream;
131-
});

0 commit comments

Comments
 (0)