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.

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

Pm 2022 09 rm planifolia #4438

Merged
merged 4 commits into from
Sep 7, 2022
Merged

Pm 2022 09 rm planifolia #4438

merged 4 commits into from
Sep 7, 2022

Conversation

philli-m
Copy link
Contributor

@philli-m philli-m commented Sep 5, 2022

this is ready for a first look over, as it's so much I might do the second round in a new pr.
still to-do

  • inline forms to be fixed including widget
  • update a4 templates so extends can be removed
  • update check for further obsolete code
  • anything that is picked up during review

@philli-m philli-m force-pushed the pm-2022-09-rm-planifolia branch 2 times, most recently from 1de49f5 to 5dc79b9 Compare September 6, 2022 10:33
@philli-m philli-m force-pushed the pm-2022-09-rm-planifolia branch from 5dc79b9 to 811a3e2 Compare September 6, 2022 12:35
Copy link
Contributor

@fuzzylogic2000 fuzzylogic2000 left a comment

Choose a reason for hiding this comment

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

Changes look good, but it's not isntalling or running for me with

ERROR in ./meinberlin/assets/scss/style.scss (./meinberlin/assets/scss/style.scss.webpack[javascript/auto]!=!./node_modules/css-loader/dist/cjs.js??ruleSet[1].rules[1].use[1]!./node_modules/postcss-loader/dist/cjs.js??ruleSet[1].rules[1].use[2]!./node_modules/sass-loader/dist/cjs.js!./meinberlin/assets/scss/style.scss)
Module build failed (from ./node_modules/sass-loader/dist/cjs.js):
SassError: Undefined variable: "$gutters".
        on line 114 of node_modules/bootstrap/scss/mixins/_grid.scss, in mixin `@content`
        from line 68 of node_modules/bootstrap/scss/mixins/_breakpoints.scss, in mixin `media-breakpoint-up`
        from line 72 of node_modules/bootstrap/scss/mixins/_grid.scss, in mixin `make-grid-columns`
        from line 32 of node_modules/bootstrap/scss/_grid.scss
        from line 9 of meinberlin/assets/scss/style.scss
>>       @each $key, $value in $gutters {

   ----------------------------^

SassError: SassError: Undefined variable: "$gutters".
        on line 114 of node_modules/bootstrap/scss/mixins/_grid.scss, in mixin `@content`
        from line 68 of node_modules/bootstrap/scss/mixins/_breakpoints.scss, in mixin `media-breakpoint-up`
        from line 72 of node_modules/bootstrap/scss/mixins/_grid.scss, in mixin `make-grid-columns`
        from line 32 of node_modules/bootstrap/scss/_grid.scss
        from line 9 of meinberlin/assets/scss/style.scss
>>       @each $key, $value in $gutters {

   ----------------------------^

    at Object.loader (/home/katharina/a4-meinberlin/node_modules/sass-loader/dist/index.js:69:14)
 @ ./meinberlin/assets/scss/style.scss

ERROR in ./meinberlin/assets/scss/style.scss
Module build failed (from ./node_modules/mini-css-extract-plugin/dist/loader.js):
HookWebpackError: Module build failed (from ./node_modules/sass-loader/dist/cjs.js):
SassError: Undefined variable: "$gutters".
        on line 114 of node_modules/bootstrap/scss/mixins/_grid.scss, in mixin `@content`
        from line 68 of node_modules/bootstrap/scss/mixins/_breakpoints.scss, in mixin `media-breakpoint-up`
        from line 72 of node_modules/bootstrap/scss/mixins/_grid.scss, in mixin `make-grid-columns`
        from line 32 of node_modules/bootstrap/scss/_grid.scss
        from line 9 of meinberlin/assets/scss/style.scss
>>       @each $key, $value in $gutters {

   ----------------------------^

    at tryRunOrWebpackError (/home/katharina/a4-meinberlin/node_modules/webpack/lib/HookWebpackError.js:88:9)
    at __webpack_require_module__ (/home/katharina/a4-meinberlin/node_modules/webpack/lib/Compilation.js:5055:12)
    at __webpack_require__ (/home/katharina/a4-meinberlin/node_modules/webpack/lib/Compilation.js:5012:18)
    at /home/katharina/a4-meinberlin/node_modules/webpack/lib/Compilation.js:5083:20
    at symbolIterator (/home/katharina/a4-meinberlin/node_modules/neo-async/async.js:3485:9)
    at done (/home/katharina/a4-meinberlin/node_modules/neo-async/async.js:3527:9)
    at Hook.eval [as callAsync] (eval at create (/home/katharina/a4-meinberlin/node_modules/tapable/lib/HookCodeFactory.js:33:10), <anonymous>:15:1)
    at /home/katharina/a4-meinberlin/node_modules/webpack/lib/Compilation.js:4990:43
    at symbolIterator (/home/katharina/a4-meinberlin/node_modules/neo-async/async.js:3482:9)
    at timesSync (/home/katharina/a4-meinberlin/node_modules/neo-async/async.js:2297:7)
-- inner error --
Error: Module build failed (from ./node_modules/sass-loader/dist/cjs.js):
SassError: Undefined variable: "$gutters".
        on line 114 of node_modules/bootstrap/scss/mixins/_grid.scss, in mixin `@content`
        from line 68 of node_modules/bootstrap/scss/mixins/_breakpoints.scss, in mixin `media-breakpoint-up`
        from line 72 of node_modules/bootstrap/scss/mixins/_grid.scss, in mixin `make-grid-columns`
        from line 32 of node_modules/bootstrap/scss/_grid.scss
        from line 9 of meinberlin/assets/scss/style.scss
>>       @each $key, $value in $gutters {

   ----------------------------^

    at Object.<anonymous> (/home/katharina/a4-meinberlin/node_modules/css-loader/dist/cjs.js??ruleSet[1].rules[1].use[1]!/home/katharina/a4-meinberlin/node_modules/postcss-loader/dist/cjs.js??ruleSet[1].rules[1].use[2]!/home/katharina/a4-meinberlin/node_modules/sass-loader/dist/cjs.js!/home/katharina/a4-meinberlin/meinberlin/assets/scss/style.scss:1:7)
    at /home/katharina/a4-meinberlin/node_modules/webpack/lib/javascript/JavascriptModulesPlugin.js:441:11
    at Hook.eval [as call] (eval at create (/home/katharina/a4-meinberlin/node_modules/tapable/lib/HookCodeFactory.js:19:10), <anonymous>:7:1)
    at /home/katharina/a4-meinberlin/node_modules/webpack/lib/Compilation.js:5057:39
    at tryRunOrWebpackError (/home/katharina/a4-meinberlin/node_modules/webpack/lib/HookWebpackError.js:83:7)
    at __webpack_require_module__ (/home/katharina/a4-meinberlin/node_modules/webpack/lib/Compilation.js:5055:12)
    at __webpack_require__ (/home/katharina/a4-meinberlin/node_modules/webpack/lib/Compilation.js:5012:18)
    at /home/katharina/a4-meinberlin/node_modules/webpack/lib/Compilation.js:5083:20
    at symbolIterator (/home/katharina/a4-meinberlin/node_modules/neo-async/async.js:3485:9)
    at done (/home/katharina/a4-meinberlin/node_modules/neo-async/async.js:3527:9)

Generated code for /home/katharina/a4-meinberlin/node_modules/css-loader/dist/cjs.js??ruleSet[1].rules[1].use[1]!/home/katharina/a4-meinberlin/node_modules/postcss-loader/dist/cjs.js??ruleSet[1].rules[1].use[2]!/home/katharina/a4-meinberlin/node_modules/sass-loader/dist/cjs.js!/home/katharina/a4-meinberlin/meinberlin/assets/scss/style.scss
1 | throw new Error("Module build failed (from ./node_modules/sass-loader/dist/cjs.js):\nSassError: Undefined variable: \"$gutters\".\n        on line 114 of node_modules/bootstrap/scss/mixins/_grid.scss, in mixin `@content`\n        from line 68 of node_modules/bootstrap/scss/mixins/_breakpoints.scss, in mixin `media-breakpoint-up`\n        from line 72 of node_modules/bootstrap/scss/mixins/_grid.scss, in mixin `make-grid-columns`\n        from line 32 of node_modules/bootstrap/scss/_grid.scss\n        from line 9 of meinberlin/assets/scss/style.scss\n>>       @each $key, $value in $gutters {\n\n   ----------------------------^\n");

@philli-m
Copy link
Contributor Author

philli-m commented Sep 6, 2022

@fuzzylogic2000 can't trigger error, was it just a normal make clean and install?

@fuzzylogic2000
Copy link
Contributor

fuzzylogic2000 commented Sep 6, 2022

@fuzzylogic2000 can't trigger error, was it just a normal make clean and install?

Yes, I did also do the installation on main and then only run make watch in your branch and also got these errors. Will delete your branch and refetch to make sure, that wasn't an old version!

Edited: but our CI also throws these errors. But what is the difference to your local version? 🤔

@philli-m
Copy link
Contributor Author

philli-m commented Sep 6, 2022

@fuzzylogic2000 tried updating import order and it's pushed, no clue why it works locally?!

@philli-m philli-m force-pushed the pm-2022-09-rm-planifolia branch from 6e30a69 to 0e59ed8 Compare September 6, 2022 13:47
@github-actions
Copy link

github-actions bot commented Sep 6, 2022

Coverage report

Total coverage

Status Category Percentage Covered / Total
🔴 Statements 9.14% 165/1805
🔴 Branches 6.45% 67/1039
🔴 Functions 8.98% 51/568
🔴 Lines 13.12% 701/5342

Status of coverage: 🟢 - ok, 🟡 - slightly more than threshold, 🔴 - under the threshold

Report generated by 🧪jest coverage report action from 0e59ed8

@philli-m
Copy link
Contributor Author

philli-m commented Sep 6, 2022

@fuzzylogic2000 now passing!

Copy link
Contributor

@fuzzylogic2000 fuzzylogic2000 left a comment

Choose a reason for hiding this comment

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

Nice!
There are still some smaller styling issues here and there, but I think, we should just merge and then fix these in later PRs!
Screenshot from 2022-09-06 15-34-51
Screenshot from 2022-09-06 15-35-05

@fuzzylogic2000 fuzzylogic2000 merged commit a55558f into main Sep 7, 2022
@fuzzylogic2000 fuzzylogic2000 deleted the pm-2022-09-rm-planifolia branch September 7, 2022 12:28
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants