Skip to content

Commit df48e2c

Browse files
author
Jonathan Eagles
committed
TEZ-4337. [TEZ UI] Upgrade to Ember 3
1 parent fd3b06c commit df48e2c

492 files changed

Lines changed: 22905 additions & 15518 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎pom.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@
6767
<roaringbitmap.version>0.7.45</roaringbitmap.version>
6868
<protoc.path>${env.PROTOC_PATH}</protoc.path>
6969
<scm.url>scm:git:https://gitbox.apache.org/repos/asf/tez.git</scm.url>
70-
<frontend-maven-plugin.version>1.4</frontend-maven-plugin.version>
70+
<frontend-maven-plugin.version>1.12.0</frontend-maven-plugin.version>
7171
<findbugs-maven-plugin.version>3.0.5</findbugs-maven-plugin.version>
7272
<maven-checkstyle-plugin.version>3.1.1</maven-checkstyle-plugin.version>
7373
<checkstyle.version>8.35</checkstyle.version>
@@ -969,7 +969,7 @@
969969
<plugin>
970970
<groupId>ro.isdc.wro4j</groupId>
971971
<artifactId>wro4j-maven-plugin</artifactId>
972-
<version>1.7.9</version>
972+
<version>1.8.0</version>
973973
<dependencies>
974974
<!-- TODO: Remove this dependency after upgrading wro4j-maven-plugin to 1.8.1 or later. -->
975975
<dependency>

‎tez-ui/pom.xml‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,8 @@
2929
<properties>
3030
<webappDir>src/main/webapp</webappDir>
3131

32-
<nodeVersion>v5.12.0</nodeVersion>
32+
<nodeVersion>v14.18.1</nodeVersion>
33+
<yarnVersion>v1.22.15</yarnVersion>
3334
<nodeExecutable>${basedir}/src/main/webapp/node/node</nodeExecutable>
3435

3536
<packageManagerScript>node/yarn/dist/bin/yarn.js</packageManagerScript>
@@ -374,7 +375,7 @@
374375
</goals>
375376
<configuration>
376377
<nodeVersion>${nodeVersion}</nodeVersion>
377-
<yarnVersion>v0.21.3</yarnVersion>
378+
<yarnVersion>${yarnVersion}</yarnVersion>
378379
</configuration>
379380
</execution>
380381
<execution>
@@ -387,6 +388,7 @@
387388
<arguments>install</arguments>
388389
</configuration>
389390
</execution>
391+
<!--
390392
<execution>
391393
<phase>generate-resources</phase>
392394
<id>bower install</id>
@@ -397,6 +399,7 @@
397399
<goal>bower</goal>
398400
</goals>
399401
</execution>
402+
-->
400403
</executions>
401404
</plugin>
402405

‎tez-ui/src/main/webapp/.bowerrc‎

Lines changed: 0 additions & 7 deletions
This file was deleted.

‎tez-ui/src/main/webapp/.editorconfig‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44

55
root = true
66

7-
87
[*]
98
end_of_line = lf
109
charset = utf-8

‎tez-ui/src/main/webapp/.eslintignore‎

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
# unconventional js
2+
/blueprints/*/files/
3+
/vendor/
4+
5+
# compiled output
6+
/dist/
7+
/tmp/
8+
9+
# dependencies
10+
/bower_components/
11+
/node_modules/
12+
13+
# misc
14+
/coverage/
15+
!.*
16+
.eslintcache
17+
18+
# ember-try
19+
/.node_modules.ember-try/
20+
/bower.json.ember-try
21+
/package.json.ember-try

‎tez-ui/src/main/webapp/.eslintrc.js‎

Lines changed: 58 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,58 @@
1+
'use strict';
2+
3+
module.exports = {
4+
root: true,
5+
parser: 'babel-eslint',
6+
parserOptions: {
7+
ecmaVersion: 2018,
8+
sourceType: 'module',
9+
ecmaFeatures: {
10+
legacyDecorators: true,
11+
},
12+
},
13+
plugins: ['ember'],
14+
extends: [
15+
'eslint:recommended',
16+
'plugin:ember/recommended',
17+
// 'plugin:prettier/recommended',
18+
],
19+
env: {
20+
browser: true,
21+
},
22+
rules: {},
23+
overrides: [
24+
// node files
25+
{
26+
files: [
27+
'.eslintrc.js',
28+
'.prettierrc.js',
29+
'.template-lintrc.js',
30+
'ember-cli-build.js',
31+
'testem.js',
32+
'blueprints/*/index.js',
33+
'config/**/*.js',
34+
'lib/*/index.js',
35+
'server/**/*.js',
36+
],
37+
parserOptions: {
38+
sourceType: 'script',
39+
},
40+
env: {
41+
browser: false,
42+
node: true,
43+
},
44+
plugins: ['node'],
45+
extends: ['plugin:node/recommended'],
46+
rules: {
47+
// this can be removed once the following is fixed
48+
// https://github.com/mysticatea/eslint-plugin-node/issues/77
49+
'node/no-unpublished-require': 'off',
50+
},
51+
},
52+
{
53+
// Test files:
54+
files: ['tests/**/*-test.{js,ts}'],
55+
extends: ['plugin:qunit/recommended'],
56+
},
57+
],
58+
};

‎tez-ui/src/main/webapp/.gitignore‎

Lines changed: 18 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,27 @@
1-
# See http://help.github.com/ignore-files/ for more about ignoring files.
1+
# See https://help.github.com/ignore-files/ for more about ignoring files.
22

33
# compiled output
4-
/dist
5-
/tmp
4+
/dist/
5+
/tmp/
66

77
# dependencies
8-
/node
9-
/node_modules
10-
/bower_components
8+
/bower_components/
9+
/node_modules/
10+
/node/
1111

1212
# misc
13+
/.env*
14+
/.pnp*
1315
/.sass-cache
16+
/.eslintcache
1417
/connect.lock
15-
/coverage/*
18+
/coverage/
1619
/libpeerconnection.log
17-
npm-debug.log
18-
testem.log
20+
/npm-debug.log*
21+
/testem.log
22+
/yarn-error.log
23+
24+
# ember-try
25+
/.node_modules.ember-try/
26+
/bower.json.ember-try
27+
/package.json.ember-try

‎tez-ui/src/main/webapp/.prettierignore‎

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
# unconventional js
2+
/blueprints/*/files/
3+
/vendor/
4+
5+
# compiled output
6+
/dist/
7+
/tmp/
8+
9+
# dependencies
10+
/bower_components/
11+
/node_modules/
12+
13+
# misc
14+
/coverage/
15+
!.*
16+
.eslintcache
17+
18+
# ember-try
19+
/.node_modules.ember-try/
20+
/bower.json.ember-try
21+
/package.json.ember-try

‎tez-ui/src/main/webapp/.prettierrc.js‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
'use strict';
2+
3+
module.exports = {
4+
singleQuote: true,
5+
};

‎tez-ui/src/main/webapp/.template-lintrc.js‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
'use strict';
2+
3+
module.exports = {
4+
extends: 'octane',
5+
};

0 commit comments

Comments
 (0)