Skip to content

Commit 9945ed7

Browse files
devversionkara
authored andcommitted
build: move packaging out of gulp folder (#5063)
1 parent e55ec78 commit 9945ed7

37 files changed

+103
-73
lines changed

gulpfile.js

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,20 @@
66

77
const path = require('path');
88

9+
const tsconfigPath = path.join(__dirname, 'tools/gulp/tsconfig.json');
10+
const tsconfig = require(tsconfigPath);
11+
912
// Register TS compilation.
1013
require('ts-node').register({
11-
project: path.join(__dirname, 'tools/gulp/tsconfig.json')
14+
project: tsconfigPath
15+
});
16+
17+
// The gulp tsconfig file maps specific imports to relative paths. In combination with ts-node
18+
// this doesn't work because the JavaScript output will still refer to the imports instead of
19+
// to the relative path. Tsconfig-paths can be used to support path mapping inside of Node.
20+
require("tsconfig-paths").register({
21+
baseUrl: path.dirname(tsconfigPath),
22+
paths: tsconfig.compilerOptions.paths
1223
});
1324

1425
require('./tools/gulp/gulpfile');

tools/gulp/gulpfile.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import {createPackageBuildTasks} from './packaging/build-tasks-gulp';
1+
import {createPackageBuildTasks} from 'material2-build-tools';
22

33
// Create gulp tasks to build the different packages in the project.
44
createPackageBuildTasks('cdk');

tools/gulp/tasks/aot.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
import {task} from 'gulp';
22
import {copySync} from 'fs-extra';
3-
import {sequenceTask, execNodeTask} from '../util/task_helpers';
3+
import {execNodeTask} from '../util/task_helpers';
44
import {join} from 'path';
5-
import {buildConfig} from '../packaging/build-config';
5+
import {buildConfig, sequenceTask} from 'material2-build-tools';
66

77
const {outputDir} = buildConfig;
88

tools/gulp/tasks/clean.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import {task} from 'gulp';
22
import {cleanTask} from '../util/task_helpers';
3-
import {buildConfig} from '../packaging/build-config';
3+
import {buildConfig} from 'material2-build-tools';
44

55

66
/** Deletes the dist/ directory. */

tools/gulp/tasks/coverage.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import {existsSync} from 'fs-extra';
44
import {spawnSync} from 'child_process';
55
import {isTravisMasterBuild} from '../util/travis-ci';
66
import {openFirebaseDashboardApp} from '../util/firebase';
7-
import {buildConfig} from '../packaging/build-config';
7+
import {buildConfig} from 'material2-build-tools';
88

99
/** Path to the file that includes all coverage information form Karma. */
1010
const coverageResultFile = join(buildConfig.outputDir, 'coverage/coverage-summary.json');

tools/gulp/tasks/development.ts

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,9 @@
11
import {task, watch} from 'gulp';
2-
import {
3-
sassBuildTask, tsBuildTask, copyTask, buildAppTask, sequenceTask, triggerLivereload,
4-
serverTask
5-
} from '../util/task_helpers';
2+
import {tsBuildTask, copyTask, buildAppTask, serverTask} from '../util/task_helpers';
63
import {join} from 'path';
7-
import {copyFiles} from '../util/copy-files';
8-
import {buildConfig} from '../packaging/build-config';
4+
import {
5+
buildConfig, copyFiles, buildScssTask, triggerLivereload, sequenceTask
6+
} from 'material2-build-tools';
97

108
// These imports don't have any typings provided.
119
const firebaseTools = require('firebase-tools');
@@ -44,7 +42,7 @@ task(':watch:devapp', () => {
4442
const tsconfigPath = join(appDir, 'tsconfig-build.json');
4543

4644
task(':build:devapp:ts', tsBuildTask(tsconfigPath));
47-
task(':build:devapp:scss', sassBuildTask(outDir, appDir));
45+
task(':build:devapp:scss', buildScssTask(outDir, appDir));
4846
task(':build:devapp:assets', copyTask(appDir, outDir));
4947
task('build:devapp', buildAppTask('devapp'));
5048

tools/gulp/tasks/docs.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import {task, src, dest} from 'gulp';
22
import {Dgeni} from 'dgeni';
33
import * as path from 'path';
4-
import {buildConfig} from '../packaging/build-config';
4+
import {buildConfig} from 'material2-build-tools';
55

66
// There are no type definitions available for these imports.
77
const markdown = require('gulp-markdown');

tools/gulp/tasks/e2e.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
import {task, watch} from 'gulp';
22
import {join} from 'path';
3-
import {ngcBuildTask, copyTask, execNodeTask, sequenceTask, serverTask} from '../util/task_helpers';
3+
import {ngcBuildTask, copyTask, execNodeTask, serverTask} from '../util/task_helpers';
44
import {copySync} from 'fs-extra';
5-
import {buildConfig} from '../packaging/build-config';
5+
import {buildConfig, sequenceTask} from 'material2-build-tools';
66

77
// There are no type definitions available for these imports.
88
const gulpConnect = require('gulp-connect');

tools/gulp/tasks/lint.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import {task} from 'gulp';
22
import {execNodeTask} from '../util/task_helpers';
33
import {join} from 'path';
4-
import {buildConfig} from '../packaging/build-config';
4+
import {buildConfig} from 'material2-build-tools';
55

66
/** Glob that matches all SCSS or CSS files that should be linted. */
77
const stylesGlob = '+(tools|src)/**/*.+(css|scss)';

tools/gulp/tasks/material-release.ts

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,7 @@ import {task, src, dest} from 'gulp';
22
import {join} from 'path';
33
import {writeFileSync, mkdirpSync} from 'fs-extra';
44
import {Bundler} from 'scss-bundle';
5-
import {sequenceTask} from '../util/task_helpers';
6-
import {composeRelease} from '../packaging/build-release';
7-
import {buildConfig} from '../packaging/build-config';
5+
import {composeRelease, buildConfig, sequenceTask} from 'material2-build-tools';
86

97
// There are no type definitions available for these imports.
108
const gulpRename = require('gulp-rename');

0 commit comments

Comments
 (0)