Skip to content

Commit

Permalink
Develop (#476)
Browse files Browse the repository at this point in the history
Develop
  • Loading branch information
Kocal committed Nov 18, 2019
2 parents 295482e + 8ddeac7 commit 9a09f7a
Show file tree
Hide file tree
Showing 6 changed files with 300 additions and 206 deletions.
4 changes: 3 additions & 1 deletion .appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,8 @@ install:
- npm install -g yarn
- yarn install --frozen-lockfile

test_script:
build_script:
- yarn build

test_script:
- yarn test -i
5 changes: 3 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -64,12 +64,13 @@ $ yarn lint --fix # will automatically fix some errors

### Contribution

- Make a pull request, its title should follows [Angular commit message convention](https://github.com/angular/angular/blob/master/CONTRIBUTING.md#commit-message-format)
- Make a pull request on `develop` branch, its title should follows [Angular commit message convention](https://github.com/angular/angular/blob/master/CONTRIBUTING.md#commit-message-format)
- You should **Squash and Merge** your pull request

### Publishing a new release

This is automatically done by Travis **every day** if there was a build in the last 24 hours.
- Open a PR `develop` to `master`
- Merge your pull request with a **Merge commit**

#### I don't want to wait

Expand Down
2 changes: 1 addition & 1 deletion lib/plugins/build/handlers/sass.ts
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ export default (api: API, entry: EntrySass, args: CLIArgs): Promise<any> => {
.pipe(concat(destFile as string))
.pipe(gulpIf(entry.sourceMaps, sourcemaps.init()))
.pipe(
sass(sassOptions).on('error', function onError(error) {
sass(sassOptions).on('error', function onError(error: string) {
// @ts-ignore
sass.logError.bind(this)(error);
reject(error);
Expand Down
12 changes: 6 additions & 6 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -69,16 +69,16 @@
"node-sass-tilde-importer": "^1.0.2",
"plugin-error": "^1.0.1",
"readable-stream": "^3.1.1",
"rollup": "^1.16.6",
"rollup": "^1.27.0",
"rollup-plugin-buble": "^0.19.8",
"rollup-plugin-commonjs": "^10.0.1",
"rollup-plugin-commonjs": "^10.1.0",
"rollup-plugin-json": "^4.0.0",
"rollup-plugin-node-builtins": "^2.1.2",
"rollup-plugin-node-globals": "^1.4.0",
"rollup-plugin-node-resolve": "^5.2.0",
"rollup-plugin-replace": "^2.2.0",
"rollup-plugin-terser": "^5.1.0",
"rollup-plugin-vue": "^5.0.1",
"rollup-plugin-terser": "^5.1.2",
"rollup-plugin-vue": "^5.1.2",
"sass": "^1.17.2",
"stylelint-formatter-pretty": "^1.0.3",
"terser": "^4.0.2",
Expand All @@ -96,9 +96,9 @@
"@types/autoprefixer": "^9.1.1",
"@types/buble": "^0.19.0",
"@types/cssnano": "^4.0.0",
"@types/dotenv": "^6.1.0",
"@types/dotenv": "^8.2.0",
"@types/eslint": "^6.1.1",
"@types/fs-extra": "^5.0.4",
"@types/fs-extra": "^8.0.1",
"@types/gulp": "^4.0.5",
"@types/gulp-concat": "^0.0.32",
"@types/gulp-if": "^0.0.33",
Expand Down
8 changes: 7 additions & 1 deletion types/modules.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,13 @@ declare module 'rollup-plugin-terser' {
export { terser };
}

declare module 'node-sass-tilde-importer' {}
declare module 'node-sass-tilde-importer' {
import { Importer } from 'node-sass';

function importer(): Importer;

export default importer;
}

declare module 'stylelint-formatter-pretty' {}

Expand Down

0 comments on commit 9a09f7a

Please sign in to comment.