Skip to content

Commit

Permalink
Bump nodejs from 12.x to 14.16.1 (kubernetes#6005)
Browse files Browse the repository at this point in the history
* Bump nodejs from 12.x to 14.16.1

Also, bump babel from 6 to 7.

* Updte package.json
  • Loading branch information
shu-mutou authored Apr 23, 2021
1 parent 73b23b8 commit 3a5dbbe
Show file tree
Hide file tree
Showing 19 changed files with 602 additions and 2,007 deletions.
2 changes: 1 addition & 1 deletion .babelrc
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
{
"presets": ["env"]
"presets": ["@babel/preset-env"]
}
4 changes: 2 additions & 2 deletions .github/workflows/cd-workflow.yml
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ jobs:
- name: Setup NodeJS
uses: actions/[email protected]
with:
node-version: 12.6.0
node-version: 14.16.1

- name: Cache Node Modules
uses: actions/cache@v2
Expand Down Expand Up @@ -99,7 +99,7 @@ jobs:
- name: Setup NodeJS
uses: actions/[email protected]
with:
node-version: 12.6.0
node-version: 14.16.1

- name: Cache Node Modules
uses: actions/cache@v2
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/ci-license-workflow.yml
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ jobs:
- name: Setup NodeJS
uses: actions/[email protected]
with:
node-version: 12.6.0
node-version: 14.16.1

- name: Cache Node Modules
uses: actions/cache@v2
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/ci-workflow.yml
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ jobs:
- name: Setup NodeJS
uses: actions/[email protected]
with:
node-version: 12.6.0
node-version: 14.16.1

- name: Cache Node Modules
uses: actions/cache@v2
Expand Down Expand Up @@ -109,7 +109,7 @@ jobs:
- name: Setup NodeJS
uses: actions/[email protected]
with:
node-version: 12.6.0
node-version: 14.16.1

- name: Cache Node Modules
uses: actions/cache@v2
Expand Down Expand Up @@ -164,7 +164,7 @@ jobs:
- name: Setup NodeJS
uses: actions/[email protected]
with:
node-version: 12.6.0
node-version: 14.16.1

- name: Cache Node Modules
uses: actions/cache@v2
Expand Down
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ dist/
coverage/
cypress/screenshots
cypress/videos
cypress/support

# System specific files:
.DS_Store
Expand Down
2 changes: 1 addition & 1 deletion aio/develop/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ FROM golang:1.15.1-buster
# Install Node.js. Go is already installed.
# A small tweak, apt-get update is already run by the nodejs setup script,
# so there's no need to run it again.
RUN curl -sL https://deb.nodesource.com/setup_12.x | bash - \
RUN curl -sL https://deb.nodesource.com/setup_14.x | bash - \
&& apt-get install -y --no-install-recommends \
nodejs \
patch \
Expand Down
2 changes: 1 addition & 1 deletion aio/gulp/gocommand.js
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ const env = lodash.merge(process.env, {PATH: devPath});
/**
* Minimum required Go Version
*/
const minGoVersion = '1.12.6';
const minGoVersion = '1.15.1';

/**
* Spawns a Go process after making sure all Go prerequisites are
Expand Down
2 changes: 1 addition & 1 deletion aio/tsconfig.app.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,5 +13,5 @@
"../src/app/frontend/**/*.spec.ts",
"../src/app/frontend/test.*.ts"
],
"lib": ["es2017", "dom"]
"lib": ["ES2020", "dom"]
}
2 changes: 1 addition & 1 deletion docs/developer/getting-started.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ Make sure the following software is installed and added to the `$PATH` variable:
* Docker 1.13.1+ ([installation manual](https://docs.docker.com/engine/installation/linux/docker-ce/ubuntu/))
* Golang 1.15+ ([installation manual](https://golang.org/dl/))
* Dashboard uses `go mod` for go dependency management, so enable it with running `export GO111MODULE=on`.
* Node.js 12+ and npm 6+ ([installation with nvm](https://github.com/creationix/nvm#usage))
* Node.js 14+ and npm 6+ ([installation with nvm](https://github.com/creationix/nvm#usage))
* Gulp.js 4+ ([installation manual](https://github.com/gulpjs/gulp/blob/master/docs/getting-started/1-quick-start.md))

Clone the repository into `$GOPATH/src/github.com/kubernetes/dashboard` and install the dependencies:
Expand Down
2 changes: 1 addition & 1 deletion i18n/de/messages.de.xlf
Original file line number Diff line number Diff line change
Expand Up @@ -1283,7 +1283,7 @@
format=&quot;short&quot;>"/><x id="CLOSE_TAG_KD_DATE" ctype="x-kd_date" equiv-text="&lt;/kd-date>"/> UTC </target>
<context-group purpose="location">
<context context-type="sourcefile">src/app/frontend/logs/template.html</context>
<context context-type="linenumber">157,100</context>
<context context-type="linenumber">157</context>
</context-group>
</trans-unit>
<trans-unit id="a21b5b669ab3f36e0f83e9a025c26662fd0616e8" datatype="html">
Expand Down
2 changes: 1 addition & 1 deletion i18n/fr/messages.fr.xlf
Original file line number Diff line number Diff line change
Expand Up @@ -1287,7 +1287,7 @@
format=&quot;short&quot;>"/><x id="CLOSE_TAG_KD_DATE" ctype="x-kd_date" equiv-text="&lt;/kd-date>"/> UTC </target>
<context-group purpose="location">
<context context-type="sourcefile">src/app/frontend/logs/template.html</context>
<context context-type="linenumber">157,100</context>
<context context-type="linenumber">157</context>
</context-group>
</trans-unit>
<trans-unit id="a21b5b669ab3f36e0f83e9a025c26662fd0616e8" datatype="html">
Expand Down
2 changes: 1 addition & 1 deletion i18n/ja/messages.ja.xlf
Original file line number Diff line number Diff line change
Expand Up @@ -4458,7 +4458,7 @@
</target>
<context-group purpose="location">
<context context-type="sourcefile">src/app/frontend/logs/template.html</context>
<context context-type="linenumber">157,100</context>
<context context-type="linenumber">157</context>
</context-group>
</trans-unit>
<trans-unit id="a21b5b669ab3f36e0f83e9a025c26662fd0616e8" datatype="html">
Expand Down
2 changes: 1 addition & 1 deletion i18n/ko/messages.ko.xlf
Original file line number Diff line number Diff line change
Expand Up @@ -4766,7 +4766,7 @@
format=&quot;short&quot;>"/><x id="CLOSE_TAG_KD_DATE" ctype="x-kd_date" equiv-text="&lt;/kd-date>"/> UTC </target>
<context-group purpose="location">
<context context-type="sourcefile">src/app/frontend/logs/template.html</context>
<context context-type="linenumber">157,100</context>
<context context-type="linenumber">157</context>
</context-group>
</trans-unit>
<trans-unit id="a21b5b669ab3f36e0f83e9a025c26662fd0616e8" datatype="html">
Expand Down
33 changes: 19 additions & 14 deletions i18n/zh-Hans/messages.zh-Hans.xlf
Original file line number Diff line number Diff line change
Expand Up @@ -95,9 +95,7 @@
</context-group>
</trans-unit>
<trans-unit id="ea458920c36540bbd94274d9074c8c9fc2906f46" datatype="html">
<source>
<x id="START_TAG_SPAN" ctype="x-span" equiv-text="&lt;span>"/>Are you sure you want to delete <x id="INTERPOLATION" equiv-text="{{data.displayName}}"/> <x id="START_ITALIC_TEXT" ctype="x-i" equiv-text="&lt;i>"/><x id="INTERPOLATION_1" equiv-text="{{data.objectMeta.name}}"/><x id="CLOSE_ITALIC_TEXT" ctype="x-i" equiv-text="&lt;/i>"/><x id="CLOSE_TAG_SPAN" ctype="x-span" equiv-text="&lt;/span>"/><x id="START_TAG_SPAN_1" ctype="x-span_1" equiv-text="&lt;span *ngIf=&quot;data.objectMeta.namespace&quot;>"/>  in namespace <x id="START_ITALIC_TEXT" ctype="x-i" equiv-text="&lt;i>"/><x id="INTERPOLATION_2" equiv-text="{{data.objectMeta.namespace}}"/><x id="CLOSE_ITALIC_TEXT" ctype="x-i" equiv-text="&lt;/i>"/><x id="CLOSE_TAG_SPAN" ctype="x-span" equiv-text="&lt;/span>"/><x id="START_TAG_SPAN" ctype="x-span" equiv-text="&lt;span>"/>?<x id="CLOSE_TAG_SPAN" ctype="x-span" equiv-text="&lt;/span>"/>
</source>
<source><x id="START_TAG_SPAN" ctype="x-span" equiv-text="&lt;span>"/>Are you sure you want to delete <x id="INTERPOLATION" equiv-text="{{data.displayName}}"/> <x id="START_ITALIC_TEXT" ctype="x-i" equiv-text="&lt;i>"/><x id="INTERPOLATION_1" equiv-text="{{data.objectMeta.name}}"/><x id="CLOSE_ITALIC_TEXT" ctype="x-i" equiv-text="&lt;/i>"/><x id="CLOSE_TAG_SPAN" ctype="x-span" equiv-text="&lt;/span>"/><x id="START_TAG_SPAN_1" ctype="x-span_1" equiv-text="&lt;span *ngIf=&quot;data.objectMeta.namespace&quot;>"/>  in namespace <x id="START_ITALIC_TEXT" ctype="x-i" equiv-text="&lt;i>"/><x id="INTERPOLATION_2" equiv-text="{{data.objectMeta.namespace}}"/><x id="CLOSE_ITALIC_TEXT" ctype="x-i" equiv-text="&lt;/i>"/><x id="CLOSE_TAG_SPAN" ctype="x-span" equiv-text="&lt;/span>"/><x id="START_TAG_SPAN" ctype="x-span" equiv-text="&lt;span>"/>?<x id="CLOSE_TAG_SPAN" ctype="x-span" equiv-text="&lt;/span>"/></source>
<target>
<x id="START_TAG_SPAN" ctype="x-span" equiv-text="&lt;span>"/>你确定要删除 <x id="INTERPOLATION" equiv-text="{{data.displayName}}"/> <x id="START_ITALIC_TEXT" ctype="x-i" equiv-text="&lt;i>"/><x id="INTERPOLATION_1" equiv-text="{{data.objectMeta.name}}"/><x id="CLOSE_ITALIC_TEXT" ctype="x-i" equiv-text="&lt;/i>"/><x id="CLOSE_TAG_SPAN" ctype="x-span" equiv-text="&lt;/span>"/>
<x id="START_TAG_SPAN_1" ctype="x-span" equiv-text="&lt;span>"/>
Expand All @@ -123,7 +121,8 @@
</context-group>
</trans-unit>
<trans-unit id="db0cf322b4bfc4f0466c9826810e3800dc4687dd" datatype="html">
<source> Download logs file </source>
<source> Download logs file
</source>
<target> 下载日志文件 </target>
<context-group purpose="location">
<context context-type="sourcefile">src/app/frontend/common/dialogs/download/dialog.ts</context>
Expand Down Expand Up @@ -237,15 +236,15 @@
</context-group>
</trans-unit>
<trans-unit id="8bad5230cdda2f915bc80289f8d81675e97e8db9" datatype="html">
<source>Scale</source>
<source> Scale </source>
<target>缩放</target>
<context-group purpose="location">
<context context-type="sourcefile">src/app/frontend/common/dialogs/scaleresource/template.html</context>
<context context-type="linenumber">73</context>
</context-group>
</trans-unit>
<trans-unit id="e67bebb0291cbe76b190e83225878cdd3a8a6df6" datatype="html">
<source>Cancel</source>
<source> Cancel </source>
<target>取消</target>
<context-group purpose="location">
<context context-type="sourcefile">src/app/frontend/common/dialogs/restartresource/dialog.ts</context>
Expand Down Expand Up @@ -289,7 +288,7 @@
</context-group>
</trans-unit>
<trans-unit id="f07e394db2e2b0e24164eba79d2140dfcbaa428c" datatype="html">
<source>Trigger</source>
<source> Trigger </source>
<target>触发</target>
<context-group purpose="location">
<context context-type="sourcefile">src/app/frontend/common/dialogs/triggerresource/template.html</context>
Expand Down Expand Up @@ -817,15 +816,17 @@
</context-group>
</trans-unit>
<trans-unit id="3bdc6249aaaf86c74f0dce8a5517fceb07ddc251" datatype="html">
<source>Containers</source>
<source>Containers
</source>
<target state="new">容器</target>
<context-group purpose="location">
<context context-type="sourcefile">src/app/frontend/resource/workloads/pod/detail/component.ts</context>
<context context-type="linenumber">89</context>
</context-group>
</trans-unit>
<trans-unit id="b363813db5514a650c55b42a0b598ed603e7c40b" datatype="html">
<source>Init containers</source>
<source>Init containers
</source>
<target state="new">Init containers</target>
<context-group purpose="location">
<context context-type="sourcefile">src/app/frontend/resource/workloads/pod/detail/component.ts</context>
Expand Down Expand Up @@ -4177,15 +4178,17 @@
</context-group>
</trans-unit>
<trans-unit id="b95afbbd2ca9a4db0384a66e1acb8f3bc45f38c9" datatype="html">
<source> Deploy </source>
<source> Deploy
</source>
<target> 部署 </target>
<context-group purpose="location">
<context context-type="sourcefile">src/app/frontend/create/from/form/template.html</context>
<context context-type="linenumber">366</context>
</context-group>
</trans-unit>
<trans-unit id="a4cdce8c5a799a664dd8189ec13429fdca405a0c" datatype="html">
<source> Cancel </source>
<source> Cancel
</source>
<target> 取消 </target>
<context-group purpose="location">
<context context-type="sourcefile">src/app/frontend/create/from/form/template.html</context>
Expand All @@ -4197,7 +4200,8 @@
</context-group>
</trans-unit>
<trans-unit id="e661f8ed8ea38e20018b90fabc40817391ead3f4" datatype="html">
<source> <x id="ICU" equiv-text="{isMoreOptionsEnabled(), select, 1 {Hide advanced options} other {Show advanced options}}"/></source>
<source> <x id="ICU" equiv-text="{isMoreOptionsEnabled(), select, 1 {Hide advanced options} other {Show advanced options}}"/>
</source>
<target> <x id="ICU" equiv-text="{isMoreOptionsEnabled(), select, 1 {隐藏高级选项} other {显示高级选项}}"/></target>
<context-group purpose="location">
<context context-type="sourcefile">src/app/frontend/create/from/form/template.html</context>
Expand Down Expand Up @@ -4237,7 +4241,8 @@
</context-group>
</trans-unit>
<trans-unit id="c449ced26e3963a5e5a689c1b5aa1678e6a1a18f" datatype="html">
<source> Upload </source>
<source> Upload
</source>
<target> 上传 </target>
<context-group purpose="location">
<context context-type="sourcefile">src/app/frontend/create/from/input/template.html</context>
Expand Down Expand Up @@ -4583,7 +4588,7 @@
format=&quot;short&quot;>"/><x id="CLOSE_TAG_KD_DATE" ctype="x-kd_date" equiv-text="&lt;/kd-date>"/> UTC </target>
<context-group purpose="location">
<context context-type="sourcefile">src/app/frontend/logs/template.html</context>
<context context-type="linenumber">157,100</context>
<context context-type="linenumber">157</context>
</context-group>
</trans-unit>
<trans-unit id="a21b5b669ab3f36e0f83e9a025c26662fd0616e8" datatype="html">
Expand Down
2 changes: 1 addition & 1 deletion i18n/zh-Hant-HK/messages.zh-Hant-HK.xlf
Original file line number Diff line number Diff line change
Expand Up @@ -4773,7 +4773,7 @@
format=&quot;short&quot;>"/><x id="CLOSE_TAG_KD_DATE" ctype="x-kd_date" equiv-text="&lt;/kd-date>"/> UTC </target>
<context-group purpose="location">
<context context-type="sourcefile">src/app/frontend/logs/template.html</context>
<context context-type="linenumber">157,100</context>
<context context-type="linenumber">157</context>
</context-group>
</trans-unit>
<trans-unit id="a21b5b669ab3f36e0f83e9a025c26662fd0616e8" datatype="html">
Expand Down
2 changes: 1 addition & 1 deletion i18n/zh-Hant/messages.zh-Hant.xlf
Original file line number Diff line number Diff line change
Expand Up @@ -4745,7 +4745,7 @@
format=&quot;short&quot;>"/><x id="CLOSE_TAG_KD_DATE" ctype="x-kd_date" equiv-text="&lt;/kd-date>"/> UTC </target>
<context-group purpose="location">
<context context-type="sourcefile">src/app/frontend/logs/template.html</context>
<context context-type="linenumber">157,100</context>
<context context-type="linenumber">157</context>
</context-group>
</trans-unit>
<trans-unit id="a21b5b669ab3f36e0f83e9a025c26662fd0616e8" datatype="html">
Expand Down
Loading

0 comments on commit 3a5dbbe

Please sign in to comment.