Skip to content

Commit

Permalink
Merge pull request #81 from qld-gov-au/fix-dependabot-alerts
Browse files Browse the repository at this point in the history
Fix dependabot alerts
  • Loading branch information
devonpis committed Jul 12, 2022
2 parents aa62f72 + 62e575d commit d90639e
Show file tree
Hide file tree
Showing 11 changed files with 38 additions and 1,129 deletions.
19 changes: 10 additions & 9 deletions .github/workspace/formiojs/package-lock.json

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
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

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
Expand Up @@ -30,6 +30,7 @@
},
"devDependencies": {},
"dependencies": {
"@formio/premium": "^1.19.0-rc.3"
"@formio/premium": "^1.18.4",
"moment": "^2.29.4"
}
}
15 changes: 1 addition & 14 deletions .storybook/main.js
@@ -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
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

0 comments on commit d90639e

Please sign in to comment.