Skip to content

Commit

Permalink
[SDPSUP-3626] Update node-sass to fix storybook build issue (#1080)
Browse files Browse the repository at this point in the history
* Update node-sass to support Node LTS version

* update test to reflect node v16 error message

* [SDPSUP-3626] Update node-sass version to fix storybook issue

* update eslintignore to ignore local storybook build

* update all example apps to use sass-loader@10

* Use amazeeio/node:14

* revert unit test change for node 14

* update lockfile
  • Loading branch information
dylankelly authored Oct 29, 2021
1 parent 797ca8a commit 91baac1
Show file tree
Hide file tree
Showing 10 changed files with 45 additions and 294 deletions.
3 changes: 2 additions & 1 deletion .eslintignore
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,8 @@ packages/ripple-nuxt-ui/**/templates/*
packages/create-ripple-app/template/nuxt/*

# ignore storybook files
src/scripts
/src/scripts
/src/public
storybook-static/

# Nuxt folders
Expand Down
1 change: 1 addition & 0 deletions .nvmrc
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
v14.18.1
4 changes: 2 additions & 2 deletions Dockerfile.storybook
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM amazeeio/node:10-builder as builder
FROM amazeeio/node:14-builder as builder

COPY packages/components /app/packages/components
COPY src /app/src
Expand All @@ -7,7 +7,7 @@ RUN yarn install
WORKDIR /app/src
RUN yarn run build-storybook

FROM amazeeio/node:10
FROM amazeeio/node:14
COPY --from=builder /app/src/public /app

ARG LAGOON_GIT_BRANCH
Expand Down
4 changes: 2 additions & 2 deletions examples/basic-examples/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -54,9 +54,9 @@
"eslint-plugin-standard": "^5.0.0",
"eslint-plugin-vue": "^7.5.0",
"lodash-webpack-plugin": "^0.11.5",
"node-sass": "^4.11.0",
"node-sass": "^6.0.1",
"sass-lint": "^1.12.1",
"sass-loader": "^6.0.7",
"sass-loader": "^10.2.0",
"sass-resources-loader": "^2.1.1",
"start-server-and-test": "^1.11.6",
"vue-jest": "^3.0.4"
Expand Down
3 changes: 1 addition & 2 deletions examples/vic-gov-au/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -50,9 +50,8 @@
"eslint-plugin-vue": "^7.5.0",
"lodash-webpack-plugin": "^0.11.5",
"mockttp": "^1.0.3",
"node-sass": "^4.11.0",
"sass-lint": "^1.12.1",
"sass-loader": "^6.0.7",
"sass-loader": "^10.2.0",
"sass-resources-loader": "^2.1.1",
"start-server-and-test": "^1.11.6",
"vue-jest": "^3.0.4"
Expand Down
4 changes: 2 additions & 2 deletions examples/vue-example-app/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,8 @@
"cross-env": "^7.0.3",
"eslint": "^7.19.0",
"eslint-plugin-vue": "^7.5.0",
"node-sass": "^4.12.0",
"sass-loader": "^7.1.0",
"node-sass": "^6.0.1",
"sass-loader": "^10.2.0",
"sass-resources-loader": "^2.1.1",
"start-server-and-test": "^1.11.6",
"vue-template-compiler": "^2.6.12"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -44,9 +44,9 @@
"eslint-plugin-standard": "^3.0.1",
"eslint-plugin-vue": "^4.0.0",
"husky": "^3.0.0",
"node-sass": "^4.11.0",
"node-sass": "^6.0.1",
"sass-lint": "^1.12.1",
"sass-loader": "^6.0.7",
"sass-loader": "^10.2.0",
"sass-resources-loader": "^2.0.0",
"start-server-and-test": "^1.7.11"
},
Expand Down
4 changes: 2 additions & 2 deletions packages/create-ripple-app/template/_package.json
Original file line number Diff line number Diff line change
Expand Up @@ -65,9 +65,9 @@
<%_ } _%>
"lodash-webpack-plugin": "^0.11.5",
"husky": "^3.0.0",
"node-sass": "^4.11.0",
"node-sass": "^6.0.1",
"sass-lint": "^1.12.1",
"sass-loader": "^6.0.7",
"sass-loader": "^10.2.0",
"sass-resources-loader": "^2.1.1",
<%_ if ((e2e === true) || (smoke === true)) { _%>
"start-server-and-test": "^1.11.6",
Expand Down
4 changes: 2 additions & 2 deletions src/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -80,9 +80,9 @@
"file-loader": "^6.0.0",
"glob-fs": "^0.1.7",
"jest-vue-preprocessor": "^1.5.0",
"node-sass": "^4.12.0",
"node-sass": "^6.0.1",
"sass-lint": "^1.12.1",
"sass-loader": "^7.1.0",
"sass-loader": "^10.2.0",
"svg-sprite-loader": "^3.7.3",
"svgo": "^1.2.2",
"svgo-loader": "^2.2.1",
Expand Down
Loading

0 comments on commit 91baac1

Please sign in to comment.