From cbe8fe7f71536caea5aabdb0b3f7e2de4f3a8ae7 Mon Sep 17 00:00:00 2001 From: Sergii Shevchenko <87487576+sergii-shevchenko-ultimaker@users.noreply.github.com> Date: Thu, 6 Mar 2025 12:56:33 +0000 Subject: [PATCH 1/6] Get rid of Process.env --- .storybook/webpack.config.js | 2 +- src/stories/layout_resource_grid.stories.tsx | 4 +--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/.storybook/webpack.config.js b/.storybook/webpack.config.js index 0289d90c..ec95adf0 100644 --- a/.storybook/webpack.config.js +++ b/.storybook/webpack.config.js @@ -2,7 +2,7 @@ const path = require('path'); const sass = require('sass'); const webpack = require('webpack'); -const static_url = process.env.STATIC_URL || 'http://localhost:9001'; +const static_url = 'http://localhost:9001'; module.exports = { plugins: [ diff --git a/src/stories/layout_resource_grid.stories.tsx b/src/stories/layout_resource_grid.stories.tsx index f46ed75b..35fd21ff 100644 --- a/src/stories/layout_resource_grid.stories.tsx +++ b/src/stories/layout_resource_grid.stories.tsx @@ -15,9 +15,7 @@ import SubResourceList from '../components/sub_resource_list'; const stories = storiesOf('Layout', module); -const logobot = process.env.NODE_ENV === 'development' - ? '../images/logobot-placeholder-dark.svg' - : './images/logobot-placeholder-dark.svg'; +const logobot = './images/logobot-placeholder-dark.svg'; stories.addDecorator(withKnobs); From e6add8e541f1fc48072e8b29e09a879a646a4ad3 Mon Sep 17 00:00:00 2001 From: Sergii Shevchenko <87487576+sergii-shevchenko-ultimaker@users.noreply.github.com> Date: Thu, 6 Mar 2025 12:57:32 +0000 Subject: [PATCH 2/6] Release v7.1.0-beta.1 --- package-lock.json | 2 +- package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package-lock.json b/package-lock.json index 307362e5..e502496c 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "@ultimaker/react-web-components", - "version": "7.0.3", + "version": "7.1.0-beta.1", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/package.json b/package.json index 20b96337..3f634f5e 100644 --- a/package.json +++ b/package.json @@ -1,5 +1,5 @@ { - "version": "7.0.3", + "version": "7.1.0-beta.1", "name": "@ultimaker/react-web-components", "description": "Ultimaker's unified react component and style library for front-end web", "main": "./dist/index.js", From 2001709febcfdc64c074c307b7008acf3dfee17c Mon Sep 17 00:00:00 2001 From: Sergii Shevchenko <87487576+sergii-shevchenko-ultimaker@users.noreply.github.com> Date: Thu, 6 Mar 2025 13:01:44 +0000 Subject: [PATCH 3/6] Actions not actioning --- .github/workflows/publish.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/publish.yaml b/.github/workflows/publish.yaml index 05ad00fb..f0e696ff 100644 --- a/.github/workflows/publish.yaml +++ b/.github/workflows/publish.yaml @@ -15,7 +15,7 @@ jobs: steps: - uses: actions/checkout@v2 - name: Npm cache - uses: actions/cache@v1 + uses: actions/cache@v4 with: path: ~/.npm key: npm-${{ hashFiles('**/package.json') }} From 83d1618072fa53f99a4507c4789ac5e7bf408109 Mon Sep 17 00:00:00 2001 From: Sergii Shevchenko <87487576+sergii-shevchenko-ultimaker@users.noreply.github.com> Date: Thu, 6 Mar 2025 13:02:18 +0000 Subject: [PATCH 4/6] Release v7.1.0-beta.2 --- package-lock.json | 2 +- package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package-lock.json b/package-lock.json index e502496c..5a09fdcb 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "@ultimaker/react-web-components", - "version": "7.1.0-beta.1", + "version": "7.1.0-beta.2", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/package.json b/package.json index 3f634f5e..cf963ea8 100644 --- a/package.json +++ b/package.json @@ -1,5 +1,5 @@ { - "version": "7.1.0-beta.1", + "version": "7.1.0-beta.2", "name": "@ultimaker/react-web-components", "description": "Ultimaker's unified react component and style library for front-end web", "main": "./dist/index.js", From db23c1d997e09fb4df62e777f71383c664d158d9 Mon Sep 17 00:00:00 2001 From: Sergii Shevchenko <87487576+sergii-shevchenko-ultimaker@users.noreply.github.com> Date: Thu, 6 Mar 2025 13:04:15 +0000 Subject: [PATCH 5/6] More actionable actions --- .github/workflows/build.yaml | 4 ++-- .github/workflows/pages.yaml | 6 +++--- .github/workflows/publish-beta.yaml | 4 ++-- .github/workflows/publish.yaml | 2 +- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index 32796a02..4ab38cd1 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -10,11 +10,11 @@ jobs: steps: - uses: actions/checkout@v2 - name: Npm cache - uses: actions/cache@v1 + uses: actions/cache@v4 with: path: ~/.npm key: npm-${{ hashFiles('**/package.json') }} - - uses: actions/setup-node@v1 + - uses: actions/setup-node@v4 with: node-version: 12.13.1 - run: npm install diff --git a/.github/workflows/pages.yaml b/.github/workflows/pages.yaml index 24800717..c3becc9f 100644 --- a/.github/workflows/pages.yaml +++ b/.github/workflows/pages.yaml @@ -12,17 +12,17 @@ jobs: steps: - uses: actions/checkout@v1 - name: Cache node modules - uses: actions/cache@v1 + uses: actions/cache@v4 with: path: /home/runner/.npm key: npm-cache-${{ hashFiles('**/package.json') }} - - uses: actions/setup-node@v1 + - uses: actions/setup-node@v4 with: node-version: 12.13.1 - run: npm install - run: npm run build - name: Upload pages - uses: actions/upload-artifact@v1 + uses: actions/upload-artifact@v3 with: name: pages path: public diff --git a/.github/workflows/publish-beta.yaml b/.github/workflows/publish-beta.yaml index e19f2995..556e8ed2 100644 --- a/.github/workflows/publish-beta.yaml +++ b/.github/workflows/publish-beta.yaml @@ -15,11 +15,11 @@ jobs: steps: - uses: actions/checkout@v2 - name: Npm cache - uses: actions/cache@v1 + uses: actions/cache@v4 with: path: ~/.npm key: npm-${{ hashFiles('**/package.json') }} - - uses: actions/setup-node@v1 + - uses: actions/setup-node@v4 with: node-version: 12.13.1 - run: npm install diff --git a/.github/workflows/publish.yaml b/.github/workflows/publish.yaml index f0e696ff..30386469 100644 --- a/.github/workflows/publish.yaml +++ b/.github/workflows/publish.yaml @@ -19,7 +19,7 @@ jobs: with: path: ~/.npm key: npm-${{ hashFiles('**/package.json') }} - - uses: actions/setup-node@v1 + - uses: actions/setup-node@v4 with: node-version: 12.13.1 - run: npm install From 38b8555ed7e8e8dce46653b94efd45b22222efa4 Mon Sep 17 00:00:00 2001 From: Sergii Shevchenko <87487576+sergii-shevchenko-ultimaker@users.noreply.github.com> Date: Thu, 6 Mar 2025 13:04:47 +0000 Subject: [PATCH 6/6] Release v7.1.0-beta.3 --- package-lock.json | 2 +- package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package-lock.json b/package-lock.json index 5a09fdcb..f4b635c7 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "@ultimaker/react-web-components", - "version": "7.1.0-beta.2", + "version": "7.1.0-beta.3", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/package.json b/package.json index cf963ea8..0771ac84 100644 --- a/package.json +++ b/package.json @@ -1,5 +1,5 @@ { - "version": "7.1.0-beta.2", + "version": "7.1.0-beta.3", "name": "@ultimaker/react-web-components", "description": "Ultimaker's unified react component and style library for front-end web", "main": "./dist/index.js",