Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix dependabot alerts #81

Merged
merged 3 commits into from Jul 12, 2022
Merged

Fix dependabot alerts #81

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9dddb66
fix dependabot alerts
devonpis Jul 11, 2022
bc7de15
remove comments
devonpis Jul 11, 2022
62e575d
update prem package
devonpis Jul 12, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
19 changes: 10 additions & 9 deletions .github/workspace/formiojs/package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 2 additions & 1 deletion .github/workspace/formiojs/package.json
View file
Open in desktop
Expand Up @@ -30,6 +30,7 @@
},
"devDependencies": {},
"dependencies": {
"formiojs": "^4.14.3"
"formiojs": "^4.14.3",
"moment": "^2.29.4"
}
}
17 changes: 8 additions & 9 deletions .github/workspace/prem/package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 2 additions & 1 deletion .github/workspace/prem/package.json
View file
Open in desktop
Expand Up @@ -30,6 +30,7 @@
},
"devDependencies": {},
"dependencies": {
"@formio/premium": "^1.19.0-rc.3"
"@formio/premium": "^1.19.0-rc.3",
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

should this not be 1.18.x?

"moment": "^2.29.4"
}
}
15 changes: 1 addition & 14 deletions .storybook/main.js
View file
Open in desktop
@@ -1,6 +1,5 @@
const path = require("path");
const CopyPlugin = require("copy-webpack-plugin");
const globImporter = require("node-sass-glob-importer");

module.exports = {
stories: ["../src/**/*.stories.mdx", "../src/**/*.stories.@(js|jsx|ts|tsx)"],
Expand Down Expand Up @@ -28,19 +27,7 @@ module.exports = {
});
config.module.rules.push({
test: /\.(s(a|c)ss)$/,
use: [
"style-loader",
"css-loader",
{
loader: "sass-loader",
options: {
sassOptions: {
// for scss wildcard import
importer: globImporter(),
},
},
},
],
use: ["style-loader", "css-loader", "sass-loader"],
});
config.module.rules.find(
(item) => item.type === "asset/resource"
Expand Down
2 changes: 2 additions & 0 deletions README.md
View file
Open in desktop
Expand Up @@ -169,6 +169,8 @@ Currently there are 2 themes in this repository:
You could preview each of the theme in storybook with the theming button in storybook toolbar.

To modify a theme for a formio component, simply create a scss file with theme id in the file extension in the component folder. ie. `src/components/Radio/sass/radio.swe.scss`.
Then import the file in `src/sass/formio.form.swe.scss`.

Please refer to `src/components/Radio/sass` for how to customise theming for any formio components.

### Adding a theme
Expand Down