vitalif-js
/
prettier
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Bump Prettier to 1.10.1 (#3699) 

* Bump Prettier to 1.10.1

* Fix relative paths
master
Lucas Azzola 2018-01-11 01:13:09 +11:00 committed by GitHub
parent 408f3d3657
commit a10418ee80
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@ -4,7 +4,6 @@
* Fixed an issue where the CLI fails to resolve a file.
# 1.10.0
[link](https://github.com/prettier/prettier/compare/1.9.2...1.10.0)

2
package.json
View File

@ -71,7 +71,7 @@
"eslint-plugin-react": "7.1.0",
"jest": "21.1.0",
"mkdirp": "0.5.1",
"prettier": "1.9.2",
"prettier": "1.10.1",
"prettylint": "1.0.0",
"rimraf": "2.6.2",
"rollup": "0.47.6",

5
scripts/build/build.js
View File

@ -26,7 +26,7 @@ shell.rm("-Rf", "dist/");
shell.exec("rollup -c scripts/build/rollup.index.config.js");
shell.exec("rollup -c scripts/build/rollup.bin.config.js");
shell.chmod("+x", "./dist/bin/prettier.js");
shell.chmod("+x", "./dist/bin-prettier.js");
shell.exec("rollup -c scripts/build/rollup.third-party.config.js");
@ -63,7 +63,7 @@ shell.sed(
/eval\("require"\)/,
"require",
"dist/index.js",
"dist/bin/prettier.js"
"dist/bin-prettier.js"
);
shell.echo("Update ISSUE_TEMPLATE.md");
@ -86,6 +86,7 @@ pipe(newIssueTemplate).to(".github/ISSUE_TEMPLATE.md");
shell.echo("Copy package.json");
const pkgWithoutDependencies = Object.assign({}, pkg);
pkgWithoutDependencies.bin = "./bin-prettier.js";
delete pkgWithoutDependencies.dependencies;
pkgWithoutDependencies.scripts = {
prepublishOnly:

4
scripts/build/rollup.bin.config.js
View File

@ -7,7 +7,7 @@ import * as path from "path";
export default Object.assign(baseConfig, {
entry: "bin/prettier.js",
dest: "dist/bin/prettier.js",
dest: "dist/bin-prettier.js",
format: "cjs",
banner: "#!/usr/bin/env node",
plugins: [
@ -34,6 +34,6 @@ export default Object.assign(baseConfig, {
path.resolve("src/common/third-party.js")
],
paths: {
[path.resolve("src/common/third-party.js")]: "../third-party"
[path.resolve("src/common/third-party.js")]: "./third-party"
}
});

2
tests_integration/runPrettier.js
View File

@ -6,7 +6,7 @@ const stripAnsi = require("strip-ansi");
const ENV_LOG_LEVEL = require("../src/cli/logger").ENV_LOG_LEVEL;
const isProduction = process.env.NODE_ENV === "production";
const prettierCli = isProduction ? "../dist/bin/prettier" : "../bin/prettier";
const prettierCli = isProduction ? "../dist/bin-prettier" : "../bin/prettier";
const thirdParty = isProduction
? "../dist/third-party"
: "../src/common/third-party";

6
yarn.lock
View File

@ -3579,9 +3579,9 @@ preserve@^0.2.0:
version "0.2.0"
resolved "https://registry.yarnpkg.com/preserve/-/preserve-0.2.0.tgz#815ed1f6ebc65926f865b310c0713bcb3315ce4b"
prettier@1.9.2:
version "1.9.2"
resolved "https://registry.yarnpkg.com/prettier/-/prettier-1.9.2.tgz#96bc2132f7a32338e6078aeb29727178c6335827"
prettier@1.10.1:
version "1.10.1"
resolved "https://registry.yarnpkg.com/prettier/-/prettier-1.10.1.tgz#01423fea6957ea23618d37d339ef0e7f7c967fc6"
pretty-format@21.3.0-beta.15:
version "21.3.0-beta.15"