Skip to content

Commit 11c16fa

Browse files
authored
Merge pull request #5744 from HSLdevcom/maintenance-fix-import
Fix component import syntax
2 parents 6cd979d + 074fd44 commit 11c16fa

9 files changed

Lines changed: 27 additions & 27 deletions

File tree

config/rollup.config.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@ export default async () => {
104104
peerDepsExternal({
105105
packageJsonPath: path.join(__dirname, basePath, 'package.json'),
106106
}),
107-
nodeResolve(),
107+
nodeResolve({ browser: true }),
108108
babel({
109109
runtimeHelpers: true,
110110
configFile: './config/babel.config.js',

digitransit-component/packages/digitransit-component-autosuggest-panel/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@digitransit-component/digitransit-component-autosuggest-panel",
3-
"version": "8.2.3",
3+
"version": "8.2.4",
44
"description": "digitransit-component autosuggest-panel module",
55
"main": "index.js",
66
"files": [
@@ -28,7 +28,7 @@
2828
"author": "Digitransit Authors",
2929
"license": "(AGPL-3.0 OR EUPL-1.2)",
3030
"peerDependencies": {
31-
"@digitransit-component/digitransit-component-autosuggest": "^7.1.4",
31+
"@digitransit-component/digitransit-component-autosuggest": "^7.1.5",
3232
"@digitransit-component/digitransit-component-icon": "^2.0.1",
3333
"@hsl-fi/sass": "1.0.0",
3434
"classnames": "2.5.1",

digitransit-component/packages/digitransit-component-autosuggest/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@digitransit-component/digitransit-component-autosuggest",
3-
"version": "7.1.4",
3+
"version": "7.1.5",
44
"description": "digitransit-component autosuggest module",
55
"main": "index.js",
66
"files": [
@@ -29,7 +29,7 @@
2929
"author": "Digitransit Authors",
3030
"license": "(AGPL-3.0 OR EUPL-1.2)",
3131
"dependencies": {
32-
"@digitransit-search-util/digitransit-search-util-execute-search-immidiate": "^3.3.3",
32+
"@digitransit-search-util/digitransit-search-util-execute-search-immidiate": "^3.3.4",
3333
"@digitransit-search-util/digitransit-search-util-get-label": "^1.0.2",
3434
"@digitransit-search-util/digitransit-search-util-uniq-by-label": "^2.1.1",
3535
"@hsl-fi/hooks": "^1.2.4"

digitransit-component/packages/digitransit-component/package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@digitransit-component/digitransit-component",
3-
"version": "5.0.7",
3+
"version": "5.0.8",
44
"description": "a JavaScript library for Digitransit",
55
"main": "digitransit-component",
66
"module": "digitransit-component.mjs",
@@ -18,8 +18,8 @@
1818
"url": "git://github.com/HSLdevcom/digitransit-ui.git"
1919
},
2020
"dependencies": {
21-
"@digitransit-component/digitransit-component-autosuggest": "^7.1.4",
22-
"@digitransit-component/digitransit-component-autosuggest-panel": "^8.2.3",
21+
"@digitransit-component/digitransit-component-autosuggest": "^7.1.5",
22+
"@digitransit-component/digitransit-component-autosuggest-panel": "^8.2.4",
2323
"@digitransit-component/digitransit-component-control-panel": "^7.1.2",
2424
"@digitransit-component/digitransit-component-favourite-bar": "^5.0.3",
2525
"@digitransit-component/digitransit-component-favourite-editing-modal": "^5.0.3",

digitransit-search-util/packages/digitransit-search-util-execute-search-immidiate/package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@digitransit-search-util/digitransit-search-util-execute-search-immidiate",
3-
"version": "3.3.3",
3+
"version": "3.3.4",
44
"description": "digitransit-search-util execute-search-immidiate module",
55
"main": "index.js",
66
"publishConfig": {
@@ -22,8 +22,8 @@
2222
"license": "(AGPL-3.0 OR EUPL-1.2)",
2323
"dependencies": {
2424
"@digitransit-search-util/digitransit-search-util-filter-matching-to-input": "1.0.0",
25-
"@digitransit-search-util/digitransit-search-util-get-geocoding-results": "1.0.0",
26-
"@digitransit-search-util/digitransit-search-util-get-json": "1.0.0",
25+
"@digitransit-search-util/digitransit-search-util-get-geocoding-results": "1.0.1",
26+
"@digitransit-search-util/digitransit-search-util-get-json": "1.0.1",
2727
"@digitransit-search-util/digitransit-search-util-helpers": "2.3.3",
2828
"lodash": "4.17.23"
2929
}

digitransit-search-util/packages/digitransit-search-util-get-geocoding-results/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@digitransit-search-util/digitransit-search-util-get-geocoding-results",
3-
"version": "1.0.0",
3+
"version": "1.0.1",
44
"description": "digitransit-search-util get-geocoding-results module",
55
"main": "index.js",
66
"publishConfig": {
@@ -21,6 +21,6 @@
2121
"author": "Digitransit Authors",
2222
"license": "(AGPL-3.0 OR EUPL-1.2)",
2323
"dependencies": {
24-
"@digitransit-search-util/digitransit-search-util-get-json": "1.0.0"
24+
"@digitransit-search-util/digitransit-search-util-get-json": "1.0.1"
2525
}
2626
}

digitransit-search-util/packages/digitransit-search-util-get-json/index.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
import axios from 'axios';
12
import serialize from '@digitransit-search-util/digitransit-search-util-serialize';
23
/**
34
* Return Promise for a url json get request
@@ -10,7 +11,6 @@ import serialize from '@digitransit-search-util/digitransit-search-util-serializ
1011
* digitransit-search-util.getJson(param1, param2);
1112
* //=response
1213
*/
13-
const axios = require('axios').default;
1414

1515
export default function getJson(url, params) {
1616
return axios

digitransit-search-util/packages/digitransit-search-util-get-json/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@digitransit-search-util/digitransit-search-util-get-json",
3-
"version": "1.0.0",
3+
"version": "1.0.1",
44
"description": "digitransit-search-util get-json module",
55
"main": "index.js",
66
"publishConfig": {

yarn.lock

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -2068,11 +2068,11 @@ __metadata:
20682068
languageName: unknown
20692069
linkType: soft
20702070

2071-
"@digitransit-component/digitransit-component-autosuggest-panel@npm:^8.2.3, @digitransit-component/digitransit-component-autosuggest-panel@workspace:digitransit-component/packages/digitransit-component-autosuggest-panel":
2071+
"@digitransit-component/digitransit-component-autosuggest-panel@npm:^8.2.4, @digitransit-component/digitransit-component-autosuggest-panel@workspace:digitransit-component/packages/digitransit-component-autosuggest-panel":
20722072
version: 0.0.0-use.local
20732073
resolution: "@digitransit-component/digitransit-component-autosuggest-panel@workspace:digitransit-component/packages/digitransit-component-autosuggest-panel"
20742074
peerDependencies:
2075-
"@digitransit-component/digitransit-component-autosuggest": ^7.1.4
2075+
"@digitransit-component/digitransit-component-autosuggest": ^7.1.5
20762076
"@digitransit-component/digitransit-component-icon": ^2.0.1
20772077
"@hsl-fi/sass": 1.0.0
20782078
classnames: 2.5.1
@@ -2087,11 +2087,11 @@ __metadata:
20872087
languageName: unknown
20882088
linkType: soft
20892089

2090-
"@digitransit-component/digitransit-component-autosuggest@npm:^7.1.4, @digitransit-component/digitransit-component-autosuggest@workspace:digitransit-component/packages/digitransit-component-autosuggest":
2090+
"@digitransit-component/digitransit-component-autosuggest@npm:^7.1.5, @digitransit-component/digitransit-component-autosuggest@workspace:digitransit-component/packages/digitransit-component-autosuggest":
20912091
version: 0.0.0-use.local
20922092
resolution: "@digitransit-component/digitransit-component-autosuggest@workspace:digitransit-component/packages/digitransit-component-autosuggest"
20932093
dependencies:
2094-
"@digitransit-search-util/digitransit-search-util-execute-search-immidiate": "npm:^3.3.3"
2094+
"@digitransit-search-util/digitransit-search-util-execute-search-immidiate": "npm:^3.3.4"
20952095
"@digitransit-search-util/digitransit-search-util-get-label": "npm:^1.0.2"
20962096
"@digitransit-search-util/digitransit-search-util-uniq-by-label": "npm:^2.1.1"
20972097
"@hsl-fi/hooks": "npm:^1.2.4"
@@ -2269,8 +2269,8 @@ __metadata:
22692269
version: 0.0.0-use.local
22702270
resolution: "@digitransit-component/digitransit-component@workspace:digitransit-component/packages/digitransit-component"
22712271
dependencies:
2272-
"@digitransit-component/digitransit-component-autosuggest": "npm:^7.1.4"
2273-
"@digitransit-component/digitransit-component-autosuggest-panel": "npm:^8.2.3"
2272+
"@digitransit-component/digitransit-component-autosuggest": "npm:^7.1.5"
2273+
"@digitransit-component/digitransit-component-autosuggest-panel": "npm:^8.2.4"
22742274
"@digitransit-component/digitransit-component-control-panel": "npm:^7.1.2"
22752275
"@digitransit-component/digitransit-component-favourite-bar": "npm:^5.0.3"
22762276
"@digitransit-component/digitransit-component-favourite-editing-modal": "npm:^5.0.3"
@@ -2304,13 +2304,13 @@ __metadata:
23042304
languageName: unknown
23052305
linkType: soft
23062306

2307-
"@digitransit-search-util/digitransit-search-util-execute-search-immidiate@npm:^3.3.3, @digitransit-search-util/digitransit-search-util-execute-search-immidiate@workspace:digitransit-search-util/packages/digitransit-search-util-execute-search-immidiate":
2307+
"@digitransit-search-util/digitransit-search-util-execute-search-immidiate@npm:^3.3.4, @digitransit-search-util/digitransit-search-util-execute-search-immidiate@workspace:digitransit-search-util/packages/digitransit-search-util-execute-search-immidiate":
23082308
version: 0.0.0-use.local
23092309
resolution: "@digitransit-search-util/digitransit-search-util-execute-search-immidiate@workspace:digitransit-search-util/packages/digitransit-search-util-execute-search-immidiate"
23102310
dependencies:
23112311
"@digitransit-search-util/digitransit-search-util-filter-matching-to-input": "npm:1.0.0"
2312-
"@digitransit-search-util/digitransit-search-util-get-geocoding-results": "npm:1.0.0"
2313-
"@digitransit-search-util/digitransit-search-util-get-json": "npm:1.0.0"
2312+
"@digitransit-search-util/digitransit-search-util-get-geocoding-results": "npm:1.0.1"
2313+
"@digitransit-search-util/digitransit-search-util-get-json": "npm:1.0.1"
23142314
"@digitransit-search-util/digitransit-search-util-helpers": "npm:2.3.3"
23152315
lodash: "npm:4.17.23"
23162316
languageName: unknown
@@ -2324,15 +2324,15 @@ __metadata:
23242324
languageName: unknown
23252325
linkType: soft
23262326

2327-
"@digitransit-search-util/digitransit-search-util-get-geocoding-results@npm:1.0.0, @digitransit-search-util/digitransit-search-util-get-geocoding-results@workspace:digitransit-search-util/packages/digitransit-search-util-get-geocoding-results":
2327+
"@digitransit-search-util/digitransit-search-util-get-geocoding-results@npm:1.0.1, @digitransit-search-util/digitransit-search-util-get-geocoding-results@workspace:digitransit-search-util/packages/digitransit-search-util-get-geocoding-results":
23282328
version: 0.0.0-use.local
23292329
resolution: "@digitransit-search-util/digitransit-search-util-get-geocoding-results@workspace:digitransit-search-util/packages/digitransit-search-util-get-geocoding-results"
23302330
dependencies:
2331-
"@digitransit-search-util/digitransit-search-util-get-json": "npm:1.0.0"
2331+
"@digitransit-search-util/digitransit-search-util-get-json": "npm:1.0.1"
23322332
languageName: unknown
23332333
linkType: soft
23342334

2335-
"@digitransit-search-util/digitransit-search-util-get-json@npm:1.0.0, @digitransit-search-util/digitransit-search-util-get-json@workspace:digitransit-search-util/packages/digitransit-search-util-get-json":
2335+
"@digitransit-search-util/digitransit-search-util-get-json@npm:1.0.1, @digitransit-search-util/digitransit-search-util-get-json@workspace:digitransit-search-util/packages/digitransit-search-util-get-json":
23362336
version: 0.0.0-use.local
23372337
resolution: "@digitransit-search-util/digitransit-search-util-get-json@workspace:digitransit-search-util/packages/digitransit-search-util-get-json"
23382338
dependencies:

0 commit comments

Comments
 (0)