Skip to content

Commit

Permalink
Merge branch 'main' into next
Browse files Browse the repository at this point in the history
  • Loading branch information
sosukesuzuki committed Dec 16, 2023
2 parents e02a13e + d09e26b commit ea7b1d2
Show file tree
Hide file tree
Showing 42 changed files with 7,187 additions and 6,788 deletions.
4 changes: 4 additions & 0 deletions .github/renovate.json5
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,10 @@
],
labels: ["dependency:tools"],
},
{
matchManagers: ["github-actions"],
groupName: "GitHub Actions",
},
],
ignoreDeps: [
// It's a dependency of `remark-parse`, use same version to reduce size
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/_build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ jobs:
run: yarn build --clean

- name: Upload Artifact
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: dist
path: dist
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/bundler-friendly.yml
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ jobs:
run: yarn install --immutable

- name: Download Artifact
uses: actions/download-artifact@v3
uses: actions/download-artifact@v4
with:
name: dist
path: dist
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/codeql.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,9 +32,9 @@ jobs:
uses: actions/checkout@v4

- name: Initialize CodeQL
uses: github/codeql-action/init@v2
uses: github/codeql-action/init@v3
with:
config-file: ./.github/codeql/codeql-config.yml

- name: Perform CodeQL Analysis
uses: github/codeql-action/analyze@v2
uses: github/codeql-action/analyze@v3
18 changes: 15 additions & 3 deletions .github/workflows/prod-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ jobs:
run: yarn install --immutable

- name: Download Artifact
uses: actions/download-artifact@v3
uses: actions/download-artifact@v4
with:
name: dist
path: dist
Expand Down Expand Up @@ -79,17 +79,29 @@ jobs:
- name: Checkout
uses: actions/checkout@v4

- name: Install yarn@3
if: ${{ matrix.node == '14' || matrix.node == '16' }}
run: |
yarn set version 3
cat .yarnrc.yml
- name: Setup Node.js
uses: actions/setup-node@v4
with:
node-version: ${{ matrix.node }}
cache: "yarn"

- name: Install Dependencies(yarn@3,mutable)
env:
YARN_ENABLE_IMMUTABLE_INSTALLS: false
if: ${{ matrix.node == '14' || matrix.node == '16' }}
run: yarn install

- name: Install Dependencies
run: yarn install --immutable

- name: Download Artifact
uses: actions/download-artifact@v3
uses: actions/download-artifact@v4
with:
name: dist
path: dist
Expand All @@ -114,7 +126,7 @@ jobs:
node-version: "0.10.48"

- name: Download Artifact
uses: actions/download-artifact@v3
uses: actions/download-artifact@v4
with:
name: dist
path: dist
Expand Down
875 changes: 0 additions & 875 deletions .yarn/releases/yarn-3.7.0.cjs

This file was deleted.

893 changes: 893 additions & 0 deletions .yarn/releases/yarn-4.0.2.cjs

Large diffs are not rendered by default.

4 changes: 3 additions & 1 deletion .yarnrc.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
compressionLevel: mixed

defaultSemverRangePrefix: ""

enableGlobalCache: true

nodeLinker: node-modules

yarnPath: .yarn/releases/yarn-3.7.0.cjs
yarnPath: .yarn/releases/yarn-4.0.2.cjs
19 changes: 19 additions & 0 deletions changelog_unreleased/angular/15777.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
#### Support formatting for Angular ICU expression (#15777 by @sosukesuzuki)

Support two kinds of Angular ICU expressions: [`plural`](https://angular.dev/guide/i18n/translation-files#translate-plurals) and [`select`](https://angular.dev/guide/i18n/translation-files#translate-alternate-expressions).

<!-- prettier-ignore -->
```html
<span i18n>
Updated:
{minutes, plural,
=0 {just now}
=1 {one minute ago}
other {{{minutes}} minutes ago}
}
</span>

<span i18n>
The author is {gender, select, male {male} female {female} other {other}}
</span>
```
1 change: 1 addition & 0 deletions cspell.json
Original file line number Diff line number Diff line change
Expand Up @@ -324,6 +324,7 @@
"Tparam",
"Tradeshift",
"Transloadit",
"treemap",
"trippable",
"tsbuild",
"tsep",
Expand Down
18 changes: 9 additions & 9 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,8 @@
"dependencies": {
"@angular/compiler": "17.0.2",
"@babel/code-frame": "7.23.5",
"@babel/parser": "7.23.5",
"@babel/types": "7.23.5",
"@babel/parser": "7.23.6",
"@babel/types": "7.23.6",
"@glimmer/syntax": "0.85.13",
"@iarna/toml": "2.2.5",
"@prettier/cli": "0.2.0",
Expand All @@ -44,7 +44,7 @@
"acorn": "8.11.2",
"acorn-jsx": "5.3.2",
"angular-estree-parser": "9.0.0",
"angular-html-parser": "5.0.2",
"angular-html-parser": "5.2.0",
"camelcase": "8.0.0",
"chalk": "5.3.0",
"ci-info": "4.0.0",
Expand All @@ -61,7 +61,7 @@
"fast-json-stable-stringify": "2.1.0",
"file-entry-cache": "7.0.2",
"find-cache-dir": "5.0.0",
"flow-parser": "0.223.3",
"flow-parser": "0.224.0",
"get-east-asian-width": "1.2.0",
"get-stdin": "9.0.0",
"graphql": "16.8.1",
Expand Down Expand Up @@ -104,11 +104,11 @@
"unified": "9.2.2",
"url-or-path": "2.3.0",
"vnopts": "2.0.0",
"wcwidth": "1.0.1",
"wcwidth.js": "1.1.2",
"yaml-unist-parser": "2.0.1"
},
"devDependencies": {
"@babel/generator": "7.23.5",
"@babel/generator": "7.23.6",
"@glimmer/reference": "0.85.13",
"@types/estree": "1.0.5",
"@types/file-entry-cache": "5.0.4",
Expand All @@ -121,9 +121,9 @@
"cross-env": "7.0.3",
"cspell": "8.0.0",
"enquirer": "2.4.1",
"esbuild": "0.19.5",
"esbuild": "0.19.9",
"esbuild-plugins-node-modules-polyfill": "1.6.1",
"esbuild-visualizer": "0.4.1",
"esbuild-visualizer": "0.5.0",
"eslint": "8.53.0",
"eslint-config-prettier": "9.1.0",
"eslint-formatter-friendly": "7.0.0",
Expand Down Expand Up @@ -209,5 +209,5 @@
"not op_mini all"
],
"preferUnplugged": true,
"packageManager": "yarn@3.7.0"
"packageManager": "yarn@4.0.2"
}
18 changes: 17 additions & 1 deletion scripts/build/esbuild-plugins/visualizer.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,20 @@
import fs from "node:fs/promises";
import { visualizer as esbuildVisualizer } from "esbuild-visualizer/dist/plugin/index.js";
import { renderTemplate as esbuildVisualizerRenderTemplate } from "esbuild-visualizer/dist/plugin/render-template.js";

/**
* @param {import("esbuild-visualizer").Metadata} metafile
* @param {{title: string, template: import("esbuild-visualizer").TemplateType}} options
*/
const getReport = async (metafile, options) => {
const data = await esbuildVisualizer(metafile);
const report = esbuildVisualizerRenderTemplate(options.template, {
title: options.title,
data,
});

return report;
};

export default function esbuildPluginVisualizer({ formats }) {
formats = Object.fromEntries(formats.map((format) => [format, true]));
Expand Down Expand Up @@ -32,8 +47,9 @@ export default function esbuildPluginVisualizer({ formats }) {
}

if (formats.html) {
const report = await esbuildVisualizer(metafile, {
const report = await getReport(metafile, {
title: files[0],
template: "treemap",
});

await fs.writeFile(`${esbuildConfig.outfile}.report.html`, report);
Expand Down
2 changes: 1 addition & 1 deletion scripts/release/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,5 +14,5 @@
"engines": {
"node": ">=18"
},
"packageManager": "yarn@3.7.0"
"packageManager": "yarn@4.0.2"
}
Loading

0 comments on commit ea7b1d2

Please sign in to comment.