Skip to content

Commit 1a10a6a

Browse files
DavidHedgehogCode
authored andcommitted
AP-19528: Update code to support typescript config.
- Define new Type according to typescript config. - Update knime-ui-extension-service to npm package. - Add type for svg files. - Update submodules. - Update .project. - Update pom.xml - versions need to be - monaco-editor: 0.34.1, - monaco-languageclient: 4.0.1, see github issue on languageclient.' AP-19528: (Update the scripting editor frontend to vue3).
1 parent 1103725 commit 1a10a6a

File tree

20 files changed

+11272
-44019
lines changed

20 files changed

+11272
-44019
lines changed

.gitmodules

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
[submodule "org.knime.python3.js.scripting/js-src/python-scripting-editor/webapps-common"]
2+
path = org.knime.python3.js.scripting/js-src/python-scripting-editor/webapps-common
3+
url = ../webapps-common
4+
branch = vue3
5+
[submodule "org.knime.python3.js.scripting/js-src/python-scripting-editor/knime-scripting-editor"]
6+
path = org.knime.python3.js.scripting/js-src/python-scripting-editor/knime-scripting-editor
7+
url = ../knime-scripting-editor
8+
branch = enh/AP-19528-update-the-the-scripting-editor

.project

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,4 +14,15 @@
1414
<natures>
1515
<nature>org.eclipse.m2e.core.maven2Nature</nature>
1616
</natures>
17+
<filteredResources>
18+
<filter>
19+
<id>1667292967902</id>
20+
<name></name>
21+
<type>30</type>
22+
<matcher>
23+
<id>org.eclipse.core.resources.regexFilterMatcher</id>
24+
<arguments>node_modules|\.git|__CREATED_BY_JAVA_LANGUAGE_SERVER__</arguments>
25+
</matcher>
26+
</filter>
27+
</filteredResources>
1728
</projectDescription>

README.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,3 +49,4 @@ You can find instructions on how to work with our code or develop extensions for
4949
## Join the Community
5050

5151
* [KNIME Forum](https://tech.knime.org/forum/knime-textprocessing)
52+

org.knime.python3.js.scripting/js-src/python-scripting-editor/.eslintrc.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,5 +17,6 @@ module.exports = {
1717
]
1818
}
1919
}
20-
}
20+
},
21+
ignorePatterns: ['webapps-common/*']
2122
};

org.knime.python3.js.scripting/js-src/python-scripting-editor/package-lock.json

Lines changed: 10835 additions & 43959 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

org.knime.python3.js.scripting/js-src/python-scripting-editor/package.json

Lines changed: 12 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,12 @@
1111
"build-only": "vite build",
1212
"type-check": "vue-tsc --noEmit",
1313
"lint": "run-p lint:*",
14+
"audit": "npm audit --omit dev",
1415
"lint:js": "eslint . --ext .vue,.js,.jsx,.cjs,.mjs,.ts,.tsx,.cts,.mts --fix --ignore-path .gitignore",
1516
"lint:css": "stylelint '**/*.{css,vue}' --fix"
1617
},
1718
"dependencies": {
19+
"@knime/ui-extension-service": "^0.3.0",
1820
"@vue/compiler-sfc": "^3.2.40",
1921
"package.json": "^2.0.1",
2022
"path-browserify": "^1.0.1",
@@ -23,24 +25,29 @@
2325
"webapps-common": "file:webapps-common"
2426
},
2527
"devDependencies": {
26-
"@knime/eslint-config": "7.0.4",
27-
"@types/node": "^18.7.12",
28+
"@knime/eslint-config": "7.0.5",
29+
"@rushstack/eslint-patch": "^1.2.0",
30+
"@types/node": "^18.11.9",
2831
"@vitejs/plugin-vue": "^3.0.1",
2932
"@vue/tsconfig": "^0.1.3",
30-
"eslint": "8.23.0",
33+
"consola": "^2.15.3",
34+
"eslint": "8.25.0",
35+
"i": "^0.3.7",
36+
"npm": "^8.19.2",
3137
"npm-run-all": "^4.1.5",
3238
"postcss-preset-env": "^7.8.1",
3339
"stylelint": "^14.11.0",
3440
"typescript": "~4.7.4",
3541
"vite": "^3.0.4",
3642
"vite-plugin-monaco-editor": "^1.1.0",
3743
"vite-svg-loader": "3.5.1",
38-
"vue-tsc": "^1.0.3"
44+
"vite-tsconfig-paths": "^3.5.2",
45+
"vue-tsc": "^1.0.9"
3946
},
4047
"engines": {
4148
"node": "18.x"
4249
},
4350
"volta": {
44-
"node": "18.0.0"
51+
"node": "18.10.0"
4552
}
4653
}

org.knime.python3.js.scripting/js-src/python-scripting-editor/pom.xml

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@
2323
<sonar.exclusions>node_modules/**/*,dist/**/*,src/dev/**/*,.nyc_output/**/*,coverage/**/*,*.log,config/**/*,**/config.js,**/*.config.js,buildtools/**,webapps-common/**</sonar.exclusions>
2424
<sonar.css.stylelint.reportPaths>target/stylelint.json</sonar.css.stylelint.reportPaths>
2525
<sonar.eslint.reportPaths>target/eslint.json</sonar.eslint.reportPaths>
26-
<node.version>v16.15.1</node.version>
27-
<npm.version>8.11.0</npm.version>
26+
<node.version>v18.10.0</node.version>
27+
<npm.version>8.19.2</npm.version>
2828
</properties>
2929

3030
<build>
@@ -48,8 +48,9 @@
4848
</configuration>
4949
</execution>
5050

51+
5152
<execution>
52-
<id>npm ci</id>
53+
<id>npm install</id>
5354
<phase>initialize</phase>
5455
<goals>
5556
<goal>npm</goal>
@@ -61,36 +62,35 @@
6162

6263
<execution>
6364
<id>npm run build</id>
64-
<phase>compile</phase>
65+
<phase>initialize</phase>
6566
<goals>
6667
<goal>npm</goal>
6768
</goals>
6869
<configuration>
6970
<arguments>run build</arguments>
7071
</configuration>
7172
</execution>
72-
7373
<execution>
74-
<id>npm run audit</id>
74+
<id>npm run type-check</id>
7575
<phase>verify</phase>
7676
<goals>
7777
<goal>npm</goal>
7878
</goals>
7979
<configuration>
80-
<arguments>run audit</arguments>
80+
<arguments>run type-check</arguments>
8181
</configuration>
8282
</execution>
83-
8483
<execution>
8584
<id>npm run lint</id>
8685
<phase>verify</phase>
8786
<goals>
8887
<goal>npm</goal>
8988
</goals>
9089
<configuration>
91-
<arguments>run lint:ci</arguments>
90+
<arguments>run lint:js</arguments>
9291
</configuration>
9392
</execution>
93+
9494
</executions>
9595
</plugin>
9696
<plugin>

org.knime.python3.js.scripting/js-src/python-scripting-editor/src/components/InputPortsView.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ export default defineComponent({
3131
{{ port.variableName }}
3232
<ul v-if="port.type === 'table'">
3333
<li
34-
v-for="column in port.columnNames"
34+
v-for="column in port?.columnNames"
3535
:key="column"
3636
>
3737
{{ column }}
Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
declare module '*.svg' {
2+
const content: any;
3+
export default content;
4+
}

org.knime.python3.js.scripting/js-src/python-scripting-editor/src/shims-tsx.d.ts

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

0 commit comments

Comments
 (0)