From 79c9901d8f43f60e5a3c5a6c617e6be9cff732bc Mon Sep 17 00:00:00 2001 From: Long Ho Date: Mon, 7 Sep 2020 00:23:58 -0400 Subject: [PATCH] build: bazel prettier --- .prettierrc.json | 7 +++ BUILD | 1 + package.json | 13 +---- packages/babel-plugin-react-intl/BUILD | 17 ++++++- packages/cli/BUILD | 18 ++++++- packages/ecma402-abstract/BUILD | 16 +++++- packages/eslint-plugin-formatjs/BUILD | 14 +++++- packages/intl-datetimeformat/BUILD | 19 ++++++- packages/intl-displaynames/BUILD | 16 +++++- packages/intl-getcanonicallocales/BUILD | 15 +++++- packages/intl-listformat/BUILD | 16 +++++- packages/intl-locale/BUILD | 14 +++++- packages/intl-messageformat-parser/BUILD | 17 ++++++- packages/intl-messageformat/BUILD | 14 +++++- packages/intl-numberformat/BUILD | 15 +++++- packages/intl-pluralrules/BUILD | 16 +++++- packages/intl-relativetimeformat/BUILD | 16 +++++- packages/intl/BUILD | 15 +++++- packages/react-intl/BUILD | 12 ++++- packages/ts-transformer/BUILD | 12 ++++- tools/index.bzl | 35 +++++++++++++ website/.prettierrc.json | 8 +++ website/BUILD | 16 ++++++ website/docs/core-concepts/icu-syntax.md | 2 + website/docs/react-intl.md | 4 +- website/package.json | 8 --- website/src/pages/index.js | 64 ++++++++++++------------ website/src/pages/styles.module.css | 12 ++--- 28 files changed, 354 insertions(+), 78 deletions(-) create mode 100644 .prettierrc.json create mode 100644 website/.prettierrc.json create mode 100644 website/BUILD diff --git a/.prettierrc.json b/.prettierrc.json new file mode 100644 index 0000000000..46581c4fd9 --- /dev/null +++ b/.prettierrc.json @@ -0,0 +1,7 @@ +{ + "singleQuote": true, + "trailingComma": "es5", + "bracketSpacing": false, + "endOfLine": "lf", + "arrowParens": "avoid" +} diff --git a/BUILD b/BUILD index 0e83bd782b..92bba9cc31 100644 --- a/BUILD +++ b/BUILD @@ -15,6 +15,7 @@ exports_files( "karma.conf.js", "karma.conf-ci.js", "jest.config.js", + ".prettierrc.json", ], visibility = ["//:__subpackages__"], ) diff --git a/package.json b/package.json index 1b61a6a11a..9e305d36e0 100644 --- a/package.json +++ b/package.json @@ -13,11 +13,10 @@ "bazel:lint": "find . -type f \\( -name \"*.bzl\" -or -name WORKSPACE -or -name BUILD -or -name BUILD.bazel \\) ! -path \"*/node_modules/*\" | xargs buildifier -v --warnings=attr-cfg,attr-license,attr-non-empty,attr-output-default,attr-single-file,constant-glob,ctx-actions,ctx-args,depset-iteration,depset-union,dict-concatenation,duplicated-name,filetype,git-repository,http-archive,integer-division,load,load-on-top,native-build,native-package,out-of-order-load,output-group,package-name,package-on-top,positional-args,redefined-variable,repository-name,same-origin-load,string-iteration,unsorted-dict-items,unused-variable", "build": "bazel build //...", "examples": "bazel run //packages/react-intl/examples", - "format:check": "yarn bazel:lint-only && yarn prettier:check", + "format:check": "yarn bazel:lint-only", "format": "yarn bazel:lint-fix && yarn prettier", "karma:ci": "bazel test :karma-ci", "karma:local": "bazel test :karma", - "prettier:check": "prettier --check '{packages,tools}/**/*.{md,ts,tsx}'", "prettier": "prettier --write '{packages,tools}/**/*.{md,ts,tsx}'", "release:next": "yarn lerna version prerelease --yes && yarn lerna exec --no-bail -- bazel run :publish --tag next", "release": "yarn lerna version --yes && yarn lerna exec --no-bail -- bazel run :publish", @@ -166,15 +165,7 @@ } }, "lint-staged": { - "(BUILD|WORKSPACE|BUILD.bazel|*.bzl)": "yarn bazel:lint-fix", - "*.{js,json,ts,tsx}": "prettier --write" - }, - "prettier": { - "singleQuote": true, - "trailingComma": "es5", - "bracketSpacing": false, - "endOfLine": "lf", - "arrowParens": "avoid" + "(BUILD|WORKSPACE|BUILD.bazel|*.bzl)": "yarn bazel:lint-fix" }, "resolutions": { "**/chokidar": "^3.4.2" diff --git a/packages/babel-plugin-react-intl/BUILD b/packages/babel-plugin-react-intl/BUILD index d7666aa369..f37e56b410 100644 --- a/packages/babel-plugin-react-intl/BUILD +++ b/packages/babel-plugin-react-intl/BUILD @@ -1,6 +1,6 @@ load("@build_bazel_rules_nodejs//:index.bzl", "generated_file_test", "pkg_npm") load("@npm//json-schema-to-typescript:index.bzl", "json2ts") -load("//tools:index.bzl", "ts_compile") +load("//tools:index.bzl", "prettier_check", "ts_compile") load("//tools:jest.bzl", "jest_test") PACKAGE_NAME = "babel-plugin-react-intl" @@ -90,3 +90,18 @@ generated_file_test( src = "tsconfig.json", generated = "//tools:tsconfig.golden.json", ) + +prettier_check( + name = "prettier", + srcs = glob( + [ + "**/*", + ], + exclude = [ + "CHANGELOG.md", + "BUILD", + "options.ts", + "tests/__snapshots__/*", + ], + ), +) diff --git a/packages/cli/BUILD b/packages/cli/BUILD index 2141337283..66c316d326 100644 --- a/packages/cli/BUILD +++ b/packages/cli/BUILD @@ -1,5 +1,5 @@ load("@build_bazel_rules_nodejs//:index.bzl", "generated_file_test", "pkg_npm") -load("//tools:index.bzl", "ts_compile") +load("//tools:index.bzl", "prettier_check", "ts_compile") load("//tools:jest.bzl", "jest_test") PACKAGE_NAME = "cli" @@ -93,3 +93,19 @@ generated_file_test( src = "tsconfig.json", generated = "//tools:tsconfig.golden.json", ) + +prettier_check( + name = "prettier", + srcs = glob( + [ + "**/*", + ], + exclude = [ + "CHANGELOG.md", + "BUILD", + # Intentional err + "tests/extract/typescript/err.tsx", + "tests/*/__snapshots__/*", + ], + ), +) diff --git a/packages/ecma402-abstract/BUILD b/packages/ecma402-abstract/BUILD index a1a8d73d58..61fd084aa3 100644 --- a/packages/ecma402-abstract/BUILD +++ b/packages/ecma402-abstract/BUILD @@ -1,5 +1,5 @@ load("@build_bazel_rules_nodejs//:index.bzl", "generated_file_test", "pkg_npm") -load("//tools:index.bzl", "generate_src_file", "ts_compile") +load("//tools:index.bzl", "generate_src_file", "prettier_check", "ts_compile") load("//tools:jest.bzl", "jest_test") PACKAGE_NAME = "ecma402-abstract" @@ -79,3 +79,17 @@ generate_src_file( "@npm//minimist", ], ) + +prettier_check( + name = "prettier", + srcs = glob( + [ + "**/*", + ], + exclude = [ + "CHANGELOG.md", + "src/NumberFormat/digit-mapping.json", + "BUILD", + ], + ), +) diff --git a/packages/eslint-plugin-formatjs/BUILD b/packages/eslint-plugin-formatjs/BUILD index 3479d8590e..29e2f4820a 100644 --- a/packages/eslint-plugin-formatjs/BUILD +++ b/packages/eslint-plugin-formatjs/BUILD @@ -1,5 +1,5 @@ load("@build_bazel_rules_nodejs//:index.bzl", "generated_file_test", "pkg_npm") -load("//tools:index.bzl", "ts_compile") +load("//tools:index.bzl", "prettier_check", "ts_compile") load("//tools:jest.bzl", "jest_test") PACKAGE_NAME = "eslint-plugin-formatjs" @@ -70,3 +70,15 @@ generated_file_test( src = "tsconfig.json", generated = "//tools:tsconfig.golden.json", ) + +prettier_check( + name = "prettier", + srcs = glob( + [ + "**/*", + ], + exclude = [ + "CHANGELOG.md", + ], + ), +) diff --git a/packages/intl-datetimeformat/BUILD b/packages/intl-datetimeformat/BUILD index d7d1a909f8..7ce04bb8b6 100644 --- a/packages/intl-datetimeformat/BUILD +++ b/packages/intl-datetimeformat/BUILD @@ -2,7 +2,7 @@ load("@build_bazel_rules_nodejs//:index.bzl", "generated_file_test", "pkg_npm") load("@npm//@bazel/rollup:index.bzl", "rollup_bundle") load("@npm//@bazel/terser:index.bzl", "terser_minified") load("@npm//ts-node:index.bzl", "ts_node") -load("//tools:index.bzl", "generate_src_file", "ts_compile") +load("//tools:index.bzl", "generate_src_file", "prettier_check", "ts_compile") load("//tools:jest.bzl", "jest_test") PACKAGE_NAME = "intl-datetimeformat" @@ -459,3 +459,20 @@ terser_minified( src = "polyfill.umd.js", sourcemap = False, ) + +prettier_check( + name = "prettier", + srcs = glob( + [ + "**/*", + ], + exclude = [ + "CHANGELOG.md", + "tests/locale-data/*", + "iana-data/*", + "src/data/*", + "data.zdump", + "test262-main.ts", + ], + ), +) diff --git a/packages/intl-displaynames/BUILD b/packages/intl-displaynames/BUILD index 8012663ad8..c73688f239 100644 --- a/packages/intl-displaynames/BUILD +++ b/packages/intl-displaynames/BUILD @@ -4,7 +4,7 @@ load("@npm//@bazel/terser:index.bzl", "terser_minified") load("@npm//@bazel/typescript:index.bzl", "ts_project") load("@npm//test262-harness:index.bzl", "test262_harness_test") load("@npm//ts-node:index.bzl", "ts_node") -load("//tools:index.bzl", "bundle_karma_tests", "generate_src_file", "ts_compile") +load("//tools:index.bzl", "bundle_karma_tests", "generate_src_file", "prettier_check", "ts_compile") load("//tools:jest.bzl", "jest_test") PACKAGE_NAME = "intl-displaynames" @@ -268,3 +268,17 @@ terser_minified( src = "polyfill.umd.js", sourcemap = False, ) + +prettier_check( + name = "prettier", + srcs = glob( + [ + "**/*", + ], + exclude = [ + "CHANGELOG.md", + "tests/locale-data/*", + "test262-main.ts", + ], + ), +) diff --git a/packages/intl-getcanonicallocales/BUILD b/packages/intl-getcanonicallocales/BUILD index 4b09000efe..3eb773a22e 100644 --- a/packages/intl-getcanonicallocales/BUILD +++ b/packages/intl-getcanonicallocales/BUILD @@ -1,7 +1,7 @@ load("@build_bazel_rules_nodejs//:index.bzl", "generated_file_test", "pkg_npm") load("@npm//@bazel/rollup:index.bzl", "rollup_bundle") load("@npm//@bazel/terser:index.bzl", "terser_minified") -load("//tools:index.bzl", "bundle_karma_tests", "generate_src_file", "ts_compile") +load("//tools:index.bzl", "bundle_karma_tests", "generate_src_file", "prettier_check", "ts_compile") load("//tools:jest.bzl", "jest_test") PACKAGE_NAME = "intl-getcanonicallocales" @@ -120,3 +120,16 @@ terser_minified( src = "polyfill.umd.js", sourcemap = False, ) + +prettier_check( + name = "prettier", + srcs = glob( + [ + "**/*", + ], + exclude = [ + "CHANGELOG.md", + "src/data/aliases.ts", + ], + ), +) diff --git a/packages/intl-listformat/BUILD b/packages/intl-listformat/BUILD index 5789d12bcc..baeaba9b5a 100644 --- a/packages/intl-listformat/BUILD +++ b/packages/intl-listformat/BUILD @@ -4,7 +4,7 @@ load("@npm//@bazel/terser:index.bzl", "terser_minified") load("@npm//@bazel/typescript:index.bzl", "ts_project") load("@npm//test262-harness:index.bzl", "test262_harness_test") load("@npm//ts-node:index.bzl", "ts_node") -load("//tools:index.bzl", "bundle_karma_tests", "generate_src_file", "ts_compile") +load("//tools:index.bzl", "bundle_karma_tests", "generate_src_file", "prettier_check", "ts_compile") load("//tools:jest.bzl", "jest_test") PACKAGE_NAME = "intl-listformat" @@ -268,3 +268,17 @@ terser_minified( src = "polyfill.umd.js", sourcemap = False, ) + +prettier_check( + name = "prettier", + srcs = glob( + [ + "**/*", + ], + exclude = [ + "CHANGELOG.md", + "tests/locale-data/*", + "test262-main.ts", + ], + ), +) diff --git a/packages/intl-locale/BUILD b/packages/intl-locale/BUILD index dd2a9a0df9..87fcbdbc0f 100644 --- a/packages/intl-locale/BUILD +++ b/packages/intl-locale/BUILD @@ -3,7 +3,7 @@ load("@npm//@bazel/rollup:index.bzl", "rollup_bundle") load("@npm//@bazel/terser:index.bzl", "terser_minified") load("@npm//@bazel/typescript:index.bzl", "ts_project") load("@npm//test262-harness:index.bzl", "test262_harness_test") -load("//tools:index.bzl", "ts_compile") +load("//tools:index.bzl", "prettier_check", "ts_compile") load("//tools:jest.bzl", "jest_test") PACKAGE_NAME = "intl-locale" @@ -140,3 +140,15 @@ terser_minified( src = "polyfill.umd.js", sourcemap = False, ) + +prettier_check( + name = "prettier", + srcs = glob( + [ + "**/*", + ], + exclude = [ + "CHANGELOG.md", + ], + ), +) diff --git a/packages/intl-messageformat-parser/BUILD b/packages/intl-messageformat-parser/BUILD index 802c4af1b5..bdb7780702 100644 --- a/packages/intl-messageformat-parser/BUILD +++ b/packages/intl-messageformat-parser/BUILD @@ -1,6 +1,6 @@ load("@build_bazel_rules_nodejs//:index.bzl", "generated_file_test", "nodejs_binary", "pkg_npm") load("@npm//ts-node:index.bzl", "ts_node") -load("//tools:index.bzl", "ts_compile") +load("//tools:index.bzl", "prettier_check", "ts_compile") load("//tools:jest.bzl", "jest_test") PACKAGE_NAME = "intl-messageformat-parser" @@ -100,3 +100,18 @@ generated_file_test( src = "tsconfig.json", generated = "//tools:tsconfig.golden.json", ) + +prettier_check( + name = "prettier", + srcs = glob( + [ + "**/*", + ], + exclude = [ + "CHANGELOG.md", + "src/parser.pegjs", + "src/parser.ts", + "tests/__snapshots__/*", + ], + ), +) diff --git a/packages/intl-messageformat/BUILD b/packages/intl-messageformat/BUILD index 67684a2165..a8249918b2 100644 --- a/packages/intl-messageformat/BUILD +++ b/packages/intl-messageformat/BUILD @@ -1,7 +1,7 @@ load("@build_bazel_rules_nodejs//:index.bzl", "generated_file_test", "pkg_npm") load("@npm//@bazel/rollup:index.bzl", "rollup_bundle") load("@npm//@bazel/terser:index.bzl", "terser_minified") -load("//tools:index.bzl", "ts_compile") +load("//tools:index.bzl", "prettier_check", "ts_compile") load("//tools:jest.bzl", "jest_test") PACKAGE_NAME = "intl-messageformat" @@ -90,3 +90,15 @@ generated_file_test( src = "tsconfig.json", generated = "//tools:tsconfig.golden.json", ) + +prettier_check( + name = "prettier", + srcs = glob( + [ + "**/*", + ], + exclude = [ + "CHANGELOG.md", + ], + ), +) diff --git a/packages/intl-numberformat/BUILD b/packages/intl-numberformat/BUILD index 083b07905b..0aaa9795e7 100644 --- a/packages/intl-numberformat/BUILD +++ b/packages/intl-numberformat/BUILD @@ -4,7 +4,7 @@ load("@npm//@bazel/terser:index.bzl", "terser_minified") load("@npm//@bazel/typescript:index.bzl", "ts_project") load("@npm//test262-harness:index.bzl", "test262_harness_test") load("@npm//ts-node:index.bzl", "ts_node") -load("//tools:index.bzl", "generate_src_file", "ts_compile") +load("//tools:index.bzl", "generate_src_file", "prettier_check", "ts_compile") load("//tools:jest.bzl", "jest_test") PACKAGE_NAME = "intl-numberformat" @@ -361,3 +361,16 @@ terser_minified( src = "polyfill.umd.js", sourcemap = False, ) + +prettier_check( + name = "prettier", + srcs = glob( + [ + "**/*.ts", + ], + exclude = [ + "src/data/*", + "test262-main.ts", + ], + ) + ["README.md"], +) diff --git a/packages/intl-pluralrules/BUILD b/packages/intl-pluralrules/BUILD index 61a504005d..5ca039be02 100644 --- a/packages/intl-pluralrules/BUILD +++ b/packages/intl-pluralrules/BUILD @@ -6,7 +6,7 @@ load("@npm//test262-harness:index.bzl", "test262_harness_test") # load("@npm//karma:index.bzl", "karma_test") load("@npm//ts-node:index.bzl", "ts_node") -load("//tools:index.bzl", "bundle_karma_tests", "generate_src_file", "ts_compile") +load("//tools:index.bzl", "bundle_karma_tests", "generate_src_file", "prettier_check", "ts_compile") load("//tools:jest.bzl", "jest_test") PACKAGE_NAME = "intl-pluralrules" @@ -262,3 +262,17 @@ terser_minified( src = "polyfill.umd.js", sourcemap = False, ) + +prettier_check( + name = "prettier", + srcs = glob( + [ + "**/*", + ], + exclude = [ + "CHANGELOG.md", + "tests/locale-data/*", + "test262-main.ts", + ], + ), +) diff --git a/packages/intl-relativetimeformat/BUILD b/packages/intl-relativetimeformat/BUILD index c6630b2516..96ce8a243d 100644 --- a/packages/intl-relativetimeformat/BUILD +++ b/packages/intl-relativetimeformat/BUILD @@ -4,7 +4,7 @@ load("@npm//@bazel/terser:index.bzl", "terser_minified") load("@npm//@bazel/typescript:index.bzl", "ts_project") load("@npm//test262-harness:index.bzl", "test262_harness_test") load("@npm//ts-node:index.bzl", "ts_node") -load("//tools:index.bzl", "bundle_karma_tests", "generate_src_file", "ts_compile") +load("//tools:index.bzl", "bundle_karma_tests", "generate_src_file", "prettier_check", "ts_compile") load("//tools:jest.bzl", "jest_test") PACKAGE_NAME = "intl-relativetimeformat" @@ -266,3 +266,17 @@ terser_minified( src = "polyfill.umd.js", sourcemap = False, ) + +prettier_check( + name = "prettier", + srcs = glob( + [ + "**/*", + ], + exclude = [ + "CHANGELOG.md", + "tests/locale-data/*", + "test262-main.ts", + ], + ), +) diff --git a/packages/intl/BUILD b/packages/intl/BUILD index 6736b62f3b..a94d934a04 100644 --- a/packages/intl/BUILD +++ b/packages/intl/BUILD @@ -1,5 +1,5 @@ load("@build_bazel_rules_nodejs//:index.bzl", "generated_file_test", "pkg_npm") -load("//tools:index.bzl", "ts_compile") +load("//tools:index.bzl", "prettier_check", "ts_compile") load("//tools:jest.bzl", "jest_test") PACKAGE_NAME = "intl" @@ -137,3 +137,16 @@ generated_file_test( src = "tsconfig.json", generated = "//tools:tsconfig.golden.json", ) + +prettier_check( + name = "prettier", + srcs = glob( + [ + "**/*", + ], + exclude = [ + "CHANGELOG.md", + "tests/__snapshot__/*", + ], + ), +) diff --git a/packages/react-intl/BUILD b/packages/react-intl/BUILD index cb29ecb5fb..f073cdb575 100644 --- a/packages/react-intl/BUILD +++ b/packages/react-intl/BUILD @@ -1,7 +1,7 @@ load("@build_bazel_rules_nodejs//:index.bzl", "generated_file_test", "pkg_npm") load("@npm//@bazel/rollup:index.bzl", "rollup_bundle") load("@npm//@bazel/terser:index.bzl", "terser_minified") -load("//tools:index.bzl", "ts_compile") +load("//tools:index.bzl", "prettier_check", "ts_compile") load("//tools:jest.bzl", "jest_test") PACKAGE_NAME = "react-intl" @@ -215,3 +215,13 @@ generated_file_test( src = "tsconfig.json", generated = "//tools:tsconfig.golden.json", ) + +prettier_check( + name = "prettier", + srcs = glob( + [ + "**/*", + ], + exclude = ["CHANGELOG.md"], + ), +) diff --git a/packages/ts-transformer/BUILD b/packages/ts-transformer/BUILD index 26a7e7bc67..a4addd1ba0 100644 --- a/packages/ts-transformer/BUILD +++ b/packages/ts-transformer/BUILD @@ -1,5 +1,5 @@ load("@build_bazel_rules_nodejs//:index.bzl", "generated_file_test", "pkg_npm") -load("//tools:index.bzl", "ts_compile") +load("//tools:index.bzl", "prettier_check", "ts_compile") load("//tools:jest.bzl", "jest_test") PACKAGE_NAME = "ts-transformer" @@ -56,3 +56,13 @@ generated_file_test( src = "tsconfig.json", generated = "//tools:tsconfig.golden.json", ) + +prettier_check( + name = "prettier", + srcs = glob( + [ + "**/*", + ], + exclude = ["CHANGELOG.md"], + ), +) diff --git a/tools/index.bzl b/tools/index.bzl index 9e18b53c4d..3d376ecfe1 100644 --- a/tools/index.bzl +++ b/tools/index.bzl @@ -4,6 +4,7 @@ load("@build_bazel_rules_nodejs//:index.bzl", "generated_file_test") load("@build_bazel_rules_nodejs//internal/js_library:js_library.bzl", "js_library") load("@npm//@bazel/rollup:index.bzl", "rollup_bundle") load("@npm//@bazel/typescript:index.bzl", "ts_project") +load("@npm//prettier:index.bzl", "prettier", "prettier_test") load("@npm//ts-node:index.bzl", "ts_node") def ts_compile(name, srcs, deps, package_name = None, skip_esm = True): @@ -122,3 +123,37 @@ def bundle_karma_tests(name, srcs, tests, data = [], deps = [], rollup_deps = [] srcs = BUNDLE_KARMA_TESTS, visibility = ["//visibility:public"], ) + +def prettier_check(name, srcs, config = "//:.prettierrc.json"): + native.filegroup( + name = "%s_srcs" % name, + srcs = srcs, + ) + + prettier_test( + name = name, + data = [ + "%s_srcs" % name, + config, + ], + templated_args = [ + "--config", + "$(rootpath %s)" % config, + "--check", + "$(rootpaths :%s_srcs)" % name, + ], + ) + + prettier( + name = "%s.update" % name, + data = [ + "%s_srcs" % name, + config, + ], + templated_args = [ + "--config", + "$(rootpath %s)" % config, + "--write", + "$(rootpaths :%s_srcs)" % name, + ], + ) diff --git a/website/.prettierrc.json b/website/.prettierrc.json new file mode 100644 index 0000000000..c771784b9a --- /dev/null +++ b/website/.prettierrc.json @@ -0,0 +1,8 @@ +{ + "singleQuote": true, + "trailingComma": "es5", + "bracketSpacing": false, + "endOfLine": "lf", + "arrowParens": "avoid", + "semi": false +} diff --git a/website/BUILD b/website/BUILD new file mode 100644 index 0000000000..6be761fcc8 --- /dev/null +++ b/website/BUILD @@ -0,0 +1,16 @@ +load("//tools:index.bzl", "prettier_check") + +prettier_check( + name = "prettier", + srcs = glob( + [ + "docs/**/*", + "lang/*", + "src/**/*", + "*.js*", + ], + ) + [ + "README.md", + ], + config = ".prettierrc.json", +) diff --git a/website/docs/core-concepts/icu-syntax.md b/website/docs/core-concepts/icu-syntax.md index bca3000226..0aaf084543 100644 --- a/website/docs/core-concepts/icu-syntax.md +++ b/website/docs/core-concepts/icu-syntax.md @@ -229,6 +229,7 @@ wrapped between them: //→ "" "'hello'" //→ "hello" + ``` Two consecutive ASCII apostrophes represents one ASCII apostrophe, similar to `%%` in `printf` represents one `%`. @@ -238,4 +239,5 @@ However, we recommend using curly apostrophe `’` (U+2019) for human-readable s ```js "This '{isn''t}' obvious." //→ "This {isn't} obvious." + ``` diff --git a/website/docs/react-intl.md b/website/docs/react-intl.md index c03008c064..e4300bf8a6 100644 --- a/website/docs/react-intl.md +++ b/website/docs/react-intl.md @@ -212,9 +212,7 @@ Assuming `navigator.language` is `"en-us"`:

Hello, World!

yesterday

-
- Amazing content. -
+
Amazing content.
``` diff --git a/website/package.json b/website/package.json index cfb653403b..42301d45e0 100644 --- a/website/package.json +++ b/website/package.json @@ -33,14 +33,6 @@ "last 1 safari version" ] }, - "prettier": { - "singleQuote": true, - "trailingComma": "es5", - "bracketSpacing": false, - "endOfLine": "lf", - "arrowParens": "avoid", - "semi": false - }, "devDependencies": { "prettier": "^2.0.5" } diff --git a/website/src/pages/index.js b/website/src/pages/index.js index 6396fe6d90..7349d7fbfd 100644 --- a/website/src/pages/index.js +++ b/website/src/pages/index.js @@ -1,19 +1,19 @@ -import React, {useState} from 'react'; -import cx from 'classnames'; -import Layout from '@theme/Layout'; -import Link from '@docusaurus/Link'; -import useDocusaurusContext from '@docusaurus/useDocusaurusContext'; -import useBaseUrl from '@docusaurus/useBaseUrl'; -import styles from './styles.module.css'; -import {IntlProvider, FormattedMessage, useIntl} from 'react-intl'; +import React, {useState} from 'react' +import cx from 'classnames' +import Layout from '@theme/Layout' +import Link from '@docusaurus/Link' +import useDocusaurusContext from '@docusaurus/useDocusaurusContext' +import useBaseUrl from '@docusaurus/useBaseUrl' +import styles from './styles.module.css' +import {IntlProvider, FormattedMessage, useIntl} from 'react-intl' -import en from '../../lang/strings_en-US.json'; -import fr from '../../lang/strings_fr-FR.json'; -import ja from '../../lang/strings_ja-JP.json'; -import cs from '../../lang/strings_cs-CZ.json'; -import pt from '../../lang/strings_pt-BR.json'; -import sv from '../../lang/strings_sv-SE.json'; -import es from '../../lang/strings_es-AR.json'; +import en from '../../lang/strings_en-US.json' +import fr from '../../lang/strings_fr-FR.json' +import ja from '../../lang/strings_ja-JP.json' +import cs from '../../lang/strings_cs-CZ.json' +import pt from '../../lang/strings_pt-BR.json' +import sv from '../../lang/strings_sv-SE.json' +import es from '../../lang/strings_es-AR.json' const MESSAGES = { 'en-US': en, @@ -23,10 +23,10 @@ const MESSAGES = { 'pt-BR': pt, 'sv-SE': sv, 'es-AR': es, -}; +} function IntegrationSection({className}) { - const intl = useIntl(); + const intl = useIntl() return (
@@ -65,7 +65,7 @@ function IntegrationSection({className}) { />

- ); + ) } function IntroSection({className}) { @@ -110,11 +110,11 @@ function IntroSection({className}) { />

- ); + ) } function EnvSection({className}) { - const intl = useIntl(); + const intl = useIntl() return (
@@ -150,7 +150,7 @@ function EnvSection({className}) { />

- ); + ) } function StandardsSection({className}) { @@ -183,12 +183,12 @@ function StandardsSection({className}) { />

- ); + ) } function Demo({className}) { - const [count, setCount] = useState(0); - const [lang, setLang] = useState('en-US'); + const [count, setCount] = useState(0) + const [lang, setLang] = useState('en-US') return (

@@ -233,12 +233,12 @@ function Demo({className}) {

- ); + ) } function Home() { - const context = useDocusaurusContext(); - const {siteConfig = {}} = context; + const context = useDocusaurusContext() + const {siteConfig = {}} = context return ( <> @@ -285,19 +285,19 @@ function Home() { - ); + ) } function App() { - const context = useDocusaurusContext(); - const {siteConfig = {}} = context; + const context = useDocusaurusContext() + const {siteConfig = {}} = context return ( - ); + ) } -export default App; +export default App diff --git a/website/src/pages/styles.module.css b/website/src/pages/styles.module.css index e22f567702..f32f923e5a 100644 --- a/website/src/pages/styles.module.css +++ b/website/src/pages/styles.module.css @@ -13,11 +13,11 @@ background-size: cover; background-position: 100%; background-color: #673a83; - background-image:url(/img/splash-head.jpg); + background-image: url(/img/splash-head.jpg); } :global(.hero__title) img { - height: 100px; + height: 100px; } :global(.hero__title) { @@ -43,7 +43,6 @@ width: 100%; } - .integration .imgs :global(.col) { display: flex; align-items: center; @@ -104,7 +103,7 @@ font-size: 16px; color: rgb(173, 104, 216); } -.demo input[type=number], +.demo input[type='number'], .demo select { width: 100px; height: 30px; @@ -130,10 +129,9 @@ padding: 1rem; border: 0.125rem solid rgba(208, 146, 247, 0.15); border-radius: 0.5rem; - background-color: rgba(208, 146, 247, 0.10); + background-color: rgba(208, 146, 247, 0.1); } .env .logos img { height: 100px; - -} \ No newline at end of file +}