Skip to content

Commit 36c7bae

Browse files
committed
Merge branch 'master' into accessible-spinner
2 parents 6dbf49f + bc8b062 commit 36c7bae

120 files changed

Lines changed: 2907 additions & 3127 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.

.storybook/main.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ const config: StorybookConfig = {
4040
babel: {
4141
overrides: [
4242
{
43-
exclude: /primitives|preset-panda|styled-system|ndla-icons|ndla-ui/,
43+
exclude: /primitives|preset-panda|styled-system|ndla-icons|ndla-ui|audio-search/,
4444
plugins: [["@emotion", { autoLabel: "always" }]],
4545
},
4646
],

babel.config.js

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,15 @@ module.exports = {
1010
},
1111
],
1212
"@babel/preset-typescript",
13-
["@babel/preset-react", { runtime: "automatic", importSource: "@emotion/react" }],
13+
["@babel/preset-react", { runtime: "automatic" }],
1414
],
15-
plugins: [["@emotion", { autoLabel: "always" }]],
15+
overrides: [
16+
{
17+
exclude: /primitives|preset-panda|styled-system|ndla-icons|ndla-ui|audio-search/,
18+
plugins: [["@emotion", { autoLabel: "always" }]],
19+
},
20+
],
21+
plugins: [],
1622
env: {
1723
test: {
1824
presets: [

package.json

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,6 @@
7878
"@types/jest": "^29.5.10",
7979
"@types/lodash.throttle": "^4.1.9",
8080
"@types/node": "^20.12.12",
81-
"@types/punycode": "^2.1.4",
8281
"@types/react": "^18.3.2",
8382
"@types/react-dom": "^18.3.0",
8483
"@vitejs/plugin-react": "^4.2.1",
@@ -89,7 +88,6 @@
8988
"cross-env": "^7.0.3",
9089
"cross-spawn": "^7.0.3",
9190
"css-loader": "^6.7.3",
92-
"date-fns": "^2.30.0",
9391
"downshift": "^3.2.2",
9492
"eslint": "^8.57.0",
9593
"i18next": "^23.11.5",

packages/article-converter/package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@ndla/article-converter",
3-
"version": "10.0.5-alpha.0",
3+
"version": "10.0.15-alpha.0",
44
"description": "Transforms NDLA articles into extended html versions",
55
"license": "GPL-3.0",
66
"main": "lib/index.js",
@@ -28,11 +28,11 @@
2828
],
2929
"devDependencies": {
3030
"@ndla/types-backend": "^0.2.86",
31-
"@ndla/types-embed": "^5.0.0-alpha.0"
31+
"@ndla/types-embed": "^5.0.1-alpha.0"
3232
},
3333
"dependencies": {
3434
"@ndla/primitives": "workspace:^",
35-
"@ndla/ui": "^56.0.5-alpha.0",
35+
"@ndla/ui": "^56.0.15-alpha.0",
3636
"html-react-parser": "^5.1.8"
3737
},
3838
"peerDependencies": {

packages/button/package.json

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@ndla/button",
3-
"version": "15.0.5-alpha.0",
3+
"version": "15.0.10-alpha.0",
44
"description": "Button component for NDLA",
55
"license": "GPL-3.0",
66
"main": "lib/index.js",
@@ -26,10 +26,10 @@
2626
"es"
2727
],
2828
"dependencies": {
29-
"@ndla/core": "^5.0.1",
30-
"@ndla/dropdown-menu": "^1.0.39-alpha.0",
31-
"@ndla/icons": "^8.0.5-alpha.0",
32-
"@ndla/tooltip": "^8.0.1"
29+
"@ndla/core": "^5.0.2",
30+
"@ndla/dropdown-menu": "^1.0.40-alpha.0",
31+
"@ndla/icons": "^8.0.10-alpha.0",
32+
"@ndla/tooltip": "^8.0.2"
3333
},
3434
"peerDependencies": {
3535
"@emotion/react": "^11.10.4",

packages/core/package.json

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@ndla/core",
3-
"version": "5.0.1",
3+
"version": "5.0.2",
44
"description": "UI component library for NDLA.",
55
"license": "GPL-3.0",
66
"main": "lib/index.js",
@@ -31,9 +31,6 @@
3131
"inuitcss": "6.0.0",
3232
"sass-mq": "^5.0.1"
3333
},
34-
"peerDependencies": {
35-
"@emotion/react": "^11.10.4"
36-
},
3734
"publishConfig": {
3835
"access": "public"
3936
},

packages/core/src/index.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,5 +16,4 @@ export { default as misc } from "./misc";
1616
export { default as shadows } from "./shadows";
1717
export { default as animations } from "./animations";
1818
export { default as utils } from "./utils";
19-
export { default as typography } from "./typography";
2019
export { default as stackOrder } from "./stackorder";

packages/core/src/typography.ts

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

packages/dropdown-menu/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@ndla/dropdown-menu",
3-
"version": "1.0.39-alpha.0",
3+
"version": "1.0.40-alpha.0",
44
"description": "Dropdown menu component for NDLA",
55
"license": "GPL-3.0",
66
"main": "lib/index.js",
@@ -26,7 +26,7 @@
2626
"es"
2727
],
2828
"dependencies": {
29-
"@ndla/core": "^5.0.1",
29+
"@ndla/core": "^5.0.2",
3030
"@radix-ui/react-dropdown-menu": "^2.0.6",
3131
"@radix-ui/react-slot": "^1.0.2"
3232
},

packages/hooks/package.json

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@ndla/hooks",
3-
"version": "2.1.8",
3+
"version": "2.1.9",
44
"description": "Collection of React hooks used by NDLA",
55
"license": "GPL-3.0",
66
"main": "lib/index.js",
@@ -27,11 +27,9 @@
2727
"es"
2828
],
2929
"peerDependencies": {
30-
"@emotion/react": "^11.10.4",
3130
"react": ">= 16.8.0"
3231
},
3332
"dependencies": {
34-
"@ndla/util": "^4.1.0",
3533
"lodash.throttle": "^4.1.1"
3634
},
3735
"publishConfig": {

0 commit comments

Comments
 (0)