Skip to content

Commit

Permalink
Merge branch '1.x' into 1.x-bump-jszip
Browse files Browse the repository at this point in the history
  • Loading branch information
seanneumann authored May 11, 2023
2 parents 7dcd12b + 501ba8a commit 5fbd39d
Show file tree
Hide file tree
Showing 21 changed files with 57 additions and 40 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@
},
"license": "Apache-2.0",
"scripts": {
"osd": "node ../../../../scripts/osd.js",
"build": "node ../../../../scripts/remove.js './target' && tsc"
"osd": "../../../../scripts/use_node ../../../../scripts/osd.js",
"build": "../../../../scripts/use_node ../../../../scripts/remove.js './target' && tsc"
},
"devDependencies": {
"@elastic/eui": "29.3.2",
Expand Down
4 changes: 2 additions & 2 deletions test/plugin_functional/plugins/app_link_test/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@
},
"license": "Apache-2.0",
"scripts": {
"osd": "node ../../../../scripts/osd.js",
"build": "node ../../../../scripts/remove.js './target' && tsc"
"osd": "../../../../scripts/use_node ../../../../scripts/osd.js",
"build": "../../../../scripts/use_node ../../../../scripts/remove.js './target' && tsc"
},
"devDependencies": {
"typescript": "4.0.2"
Expand Down
4 changes: 2 additions & 2 deletions test/plugin_functional/plugins/core_app_status/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@
},
"license": "Apache-2.0",
"scripts": {
"osd": "node ../../../../scripts/osd.js",
"build": "node ../../../../scripts/remove.js './target' && tsc"
"osd": "../../../../scripts/use_node ../../../../scripts/osd.js",
"build": "../../../../scripts/use_node ../../../../scripts/remove.js './target' && tsc"
},
"devDependencies": {
"typescript": "4.0.2"
Expand Down
4 changes: 2 additions & 2 deletions test/plugin_functional/plugins/core_plugin_a/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@
},
"license": "Apache-2.0",
"scripts": {
"osd": "node ../../../../scripts/osd.js",
"build": "node ../../../../scripts/remove.js './target' && tsc"
"osd": "../../../../scripts/use_node ../../../../scripts/osd.js",
"build": "../../../../scripts/use_node ../../../../scripts/remove.js './target' && tsc"
},
"devDependencies": {
"typescript": "4.0.2"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@
},
"license": "Apache-2.0",
"scripts": {
"osd": "node ../../../../scripts/osd.js",
"build": "node ../../../../scripts/remove.js './target' && tsc"
"osd": "../../../../scripts/use_node ../../../../scripts/osd.js",
"build": "../../../../scripts/use_node ../../../../scripts/remove.js './target' && tsc"
},
"devDependencies": {
"typescript": "4.0.2"
Expand Down
4 changes: 2 additions & 2 deletions test/plugin_functional/plugins/core_plugin_b/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@
},
"license": "Apache-2.0",
"scripts": {
"osd": "node ../../../../scripts/osd.js",
"build": "node ../../../../scripts/remove.js './target' && tsc"
"osd": "../../../../scripts/use_node ../../../../scripts/osd.js",
"build": "../../../../scripts/use_node ../../../../scripts/remove.js './target' && tsc"
},
"devDependencies": {
"typescript": "4.0.2"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@
},
"license": "Apache-2.0",
"scripts": {
"osd": "node ../../../../scripts/osd.js",
"build": "node ../../../../scripts/remove.js './target' && tsc"
"osd": "../../../../scripts/use_node ../../../../scripts/osd.js",
"build": "../../../../scripts/use_node ../../../../scripts/remove.js './target' && tsc"
},
"devDependencies": {
"typescript": "4.0.2"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@
},
"license": "Apache-2.0",
"scripts": {
"osd": "node ../../../../scripts/osd.js",
"build": "node ../../../../scripts/remove.js './target' && tsc"
"osd": "../../../../scripts/use_node ../../../../scripts/osd.js",
"build": "../../../../scripts/use_node ../../../../scripts/remove.js './target' && tsc"
},
"devDependencies": {
"typescript": "4.0.2"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@
},
"license": "Apache-2.0",
"scripts": {
"osd": "node ../../../../scripts/osd.js",
"build": "node ../../../../scripts/remove.js './target' && tsc"
"osd": "../../../../scripts/use_node ../../../../scripts/osd.js",
"build": "../../../../scripts/use_node ../../../../scripts/remove.js './target' && tsc"
},
"devDependencies": {
"typescript": "4.0.2"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@
},
"license": "Apache-2.0",
"scripts": {
"osd": "node ../../../../scripts/osd.js",
"build": "node ../../../../scripts/remove.js './target' && tsc"
"osd": "../../../../scripts/use_node ../../../../scripts/osd.js",
"build": "../../../../scripts/use_node ../../../../scripts/remove.js './target' && tsc"
},
"devDependencies": {
"typescript": "4.0.2"
Expand Down
4 changes: 2 additions & 2 deletions test/plugin_functional/plugins/data_search/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
},
"license": "Apache-2.0",
"scripts": {
"osd": "node ../../../../scripts/osd.js",
"build": "node ../../../../scripts/remove.js './target' && tsc"
"osd": "../../../../scripts/use_node ../../../../scripts/osd.js",
"build": "../../../../scripts/use_node ../../../../scripts/remove.js './target' && tsc"
},
"devDependencies": {
"typescript": "4.0.2"
Expand Down
17 changes: 17 additions & 0 deletions test/plugin_functional/plugins/doc_views_links_plugin/package.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
{
"name": "docViewLinksPlugin",
"version": "1.0.0",
"main": "target/test/plugin_functional/plugins/doc_views_links_plugin",
"opensearchDashboards": {
"version": "opensearchDashboards",
"templateVersion": "1.0.0"
},
"license": "Apache-2.0",
"scripts": {
"osd": "../../../../scripts/use_node ../../../../scripts/osd.js",
"build": "../../../../scripts/use_node ../../../../scripts/remove.js './target' && tsc"
},
"devDependencies": {
"typescript": "4.0.2"
}
}
4 changes: 2 additions & 2 deletions test/plugin_functional/plugins/doc_views_plugin/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@
},
"license": "Apache-2.0",
"scripts": {
"osd": "node ../../../../scripts/osd.js",
"build": "node ../../../../scripts/remove.js './target' && tsc"
"osd": "../../../../scripts/use_node ../../../../scripts/osd.js",
"build": "../../../../scripts/use_node ../../../../scripts/remove.js './target' && tsc"
},
"devDependencies": {
"typescript": "4.0.2"
Expand Down
4 changes: 2 additions & 2 deletions test/plugin_functional/plugins/index_patterns/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@
},
"license": "Apache-2.0",
"scripts": {
"osd": "node ../../../../scripts/osd.js",
"build": "node ../../../../scripts/remove.js './target' && tsc"
"osd": "../../../../scripts/use_node ../../../../scripts/osd.js",
"build": "../../../../scripts/use_node ../../../../scripts/remove.js './target' && tsc"
},
"devDependencies": {
"typescript": "4.0.2"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@
},
"license": "Apache-2.0",
"scripts": {
"osd": "node ../../../../scripts/osd.js",
"build": "node ../../../../scripts/remove.js './target' && tsc"
"osd": "../../../../scripts/use_node ../../../../scripts/osd.js",
"build": "../../../../scripts/use_node ../../../../scripts/remove.js './target' && tsc"
},
"devDependencies": {
"typescript": "4.0.2"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
},
"license": "Apache-2.0",
"scripts": {
"osd": "node ../../../../scripts/osd.js",
"build": "node ../../../../scripts/remove.js './target' && tsc"
"osd": "../../../../scripts/use_node ../../../../scripts/osd.js",
"build": "../../../../scripts/use_node ../../../../scripts/remove.js './target' && tsc"
},
"devDependencies": {
"typescript": "4.0.2"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@
},
"license": "Apache-2.0",
"scripts": {
"osd": "node ../../../../scripts/osd.js",
"build": "node ../../../../scripts/remove.js './target' && tsc"
"osd": "../../../../scripts/use_node ../../../../scripts/osd.js",
"build": "../../../../scripts/use_node ../../../../scripts/remove.js './target' && tsc"
},
"devDependencies": {
"@elastic/eui": "29.3.2",
Expand Down
4 changes: 2 additions & 2 deletions test/plugin_functional/plugins/osd_top_nav/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@
},
"license": "Apache-2.0",
"scripts": {
"osd": "node ../../../../scripts/osd.js",
"build": "node ../../../../scripts/remove.js './target' && tsc"
"osd": "../../../../scripts/use_node ../../../../scripts/osd.js",
"build": "../../../../scripts/use_node ../../../../scripts/remove.js './target' && tsc"
},
"devDependencies": {
"typescript": "4.0.2"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@
},
"license": "Apache-2.0",
"scripts": {
"osd": "node ../../../../scripts/osd.js",
"build": "node ../../../../scripts/remove.js './target' && tsc"
"osd": "../../../../scripts/use_node ../../../../scripts/osd.js",
"build": "../../../../scripts/use_node ../../../../scripts/remove.js './target' && tsc"
},
"devDependencies": {
"@elastic/eui": "29.3.2",
Expand Down
4 changes: 2 additions & 2 deletions test/plugin_functional/plugins/rendering_plugin/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@
},
"license": "Apache-2.0",
"scripts": {
"osd": "node ../../../../scripts/osd.js",
"build": "node ../../../../scripts/remove.js './target' && tsc"
"osd": "../../../../scripts/use_node ../../../../scripts/osd.js",
"build": "../../../../scripts/use_node ../../../../scripts/remove.js './target' && tsc"
},
"devDependencies": {
"typescript": "4.0.2"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@
},
"license": "Apache-2.0",
"scripts": {
"osd": "node ../../../../scripts/osd.js",
"build": "node ../../scripts/remove.js './target' && tsc"
"osd": "../../../../scripts/use_node ../../../../scripts/osd.js",
"build": "../../../../scripts/use_node ../../scripts/remove.js './target' && tsc"
},
"devDependencies": {
"typescript": "4.0.2"
Expand Down

0 comments on commit 5fbd39d

Please sign in to comment.