Skip to content

Commit

Permalink
resolve conflicts
Browse files Browse the repository at this point in the history
  • Loading branch information
kamilmysliwiec committed Dec 19, 2019
2 parents a42e0b5 + dc7b0a6 commit e09fd79
Show file tree
Hide file tree
Showing 14 changed files with 768 additions and 327 deletions.
7 changes: 7 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,11 @@ node_modules
schematics/
dist

src/lib/**/*.js
src/lib/**/*.d.ts
!src/lib/**/files/**/*
!src/lib/**/workspace/**/*
src/utils/**/*.js
src/utils/**/*.d.ts

.DS_Store
4 changes: 4 additions & 0 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -26,11 +26,15 @@ RUN npm run -s lint:src && npm run -s lint:test
FROM node:carbon-alpine as tester
WORKDIR /nestjs/schematics
COPY --from=linter /nestjs/schematics .
COPY tools tools
COPY gulpfile.js gulpfile.js
RUN npm test -s

FROM node:carbon-alpine as builder
WORKDIR /nestjs/schematics
COPY --from=tester /nestjs/schematics .
COPY tsconfig.lib.json tsconfig.lib.json
COPY tsconfig.utils.json tsconfig.utils.json
RUN npm run -s build

FROM node:carbon-alpine
Expand Down
16 changes: 16 additions & 0 deletions gulpfile.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
'use strict';
/**
* Load the TypeScript compiler, then load the TypeScript gulpfile which simply loads all
* the tasks. The tasks are really inside tools/gulp/tasks.
*/

const path = require('path');

const projectDir = __dirname;
const tsconfigPath = path.join(projectDir, 'tools/gulp/tsconfig.json');

require('ts-node').register({
project: tsconfigPath,
});

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

0 comments on commit e09fd79

Please sign in to comment.