From 7b983e9b05b99f50d2f0cd2b0b9af1cff66d239c Mon Sep 17 00:00:00 2001 From: Margarida Silva Date: Wed, 4 Nov 2020 11:42:27 +0000 Subject: [PATCH 01/33] Storybook route --- vercel.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vercel.json b/vercel.json index 2742d91..90c94ea 100644 --- a/vercel.json +++ b/vercel.json @@ -10,7 +10,7 @@ } ], "routes": [ - { "src": "/", "dest": "/storybook/index.html" }, + { "src": "/storybook", "dest": "/storybook/index.html" }, { "src": "/(?!res)(.*)", "dest": "/styleguide/$1" } ] } From 2238deb66cbd1ed6d682c95603ea31d454d877ba Mon Sep 17 00:00:00 2001 From: Margarida Silva Date: Wed, 4 Nov 2020 12:05:23 +0000 Subject: [PATCH 02/33] Update vercel script --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 5c8d201..d5683e4 100644 --- a/package.json +++ b/package.json @@ -43,7 +43,7 @@ "lint-fix:stylelint": "stylelint \"./**/*.{css,scss,vue}\" --fix", "lint:base": "eslint \"./**/*.{js,vue}\"", "lint:stylelint": "stylelint \"./**/*.{css,scss,vue}\"", - "now-build": "npm run build && npm run build-storybook && npm run docs:build && cp -r res dist/", + "vercel-build": "npm run build && npm run build-storybook && npm run docs:build && cp -r res dist/", "prettier": "prettier \"./**/*.{js,vue,json}\" --write", "pretty": "npm run prettier && npm run lint-fix && npm run svgo", "storybook": "start-storybook -p 9001 -c .storybook", From 96fe25cef23e1957b262e1cbbe551ecdc5836b11 Mon Sep 17 00:00:00 2001 From: Margarida Silva Date: Wed, 4 Nov 2020 12:25:34 +0000 Subject: [PATCH 03/33] Try with new routes --- vercel.json | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/vercel.json b/vercel.json index 90c94ea..1e71936 100644 --- a/vercel.json +++ b/vercel.json @@ -9,8 +9,7 @@ } } ], - "routes": [ - { "src": "/storybook", "dest": "/storybook/index.html" }, - { "src": "/(?!res)(.*)", "dest": "/styleguide/$1" } + "redirects": [ + { "source": "/", "destination": "/storybook/index.html" } ] } From 2e4494613fb5b39bc489491e82e57df785a98ca2 Mon Sep 17 00:00:00 2001 From: Margarida Silva Date: Wed, 4 Nov 2020 12:30:48 +0000 Subject: [PATCH 04/33] No dll option and reverted routes --- package.json | 2 +- vercel.json | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/package.json b/package.json index d5683e4..e3f2fdb 100644 --- a/package.json +++ b/package.json @@ -33,7 +33,7 @@ "scripts": { "build": "cross-env NODE_ENV=production webpack --mode production --config webpack.config.js", "build-dev": "cross-env NODE_ENV=development webpack --mode development --config webpack.config.js", - "build-storybook": "cross-env NODE_ENV=development build-storybook -c .storybook -o dist/storybook", + "build-storybook": "cross-env NODE_ENV=development build-storybook -c .storybook -o dist/storybook --no-dll", "dev": "cross-env NODE_ENV=development webpack-dev-server --config webpack.config.js --mode development --watch --hot", "docs": "vue-styleguidist server", "docs:build": "vue-styleguidist build", diff --git a/vercel.json b/vercel.json index 1e71936..61dad1d 100644 --- a/vercel.json +++ b/vercel.json @@ -9,7 +9,8 @@ } } ], - "redirects": [ - { "source": "/", "destination": "/storybook/index.html" } + "routes": [ + { "src": "/docs/(.*)", "dest": "/styleguide/$1" }, + { "src": "/(?!res)(.*)", "dest": "/storybook/index.html" } ] } From 6991fec3134b46aae434da7c581c5fbd73285962 Mon Sep 17 00:00:00 2001 From: Margarida Silva Date: Wed, 4 Nov 2020 12:46:34 +0000 Subject: [PATCH 05/33] Another try --- vercel.json | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/vercel.json b/vercel.json index 61dad1d..2d085cf 100644 --- a/vercel.json +++ b/vercel.json @@ -3,14 +3,13 @@ "builds": [ { "src": "package.json", - "use": "@now/static-build", + "use": "@vercel/static-build", "config": { "distDir": "dist" } } ], "routes": [ - { "src": "/docs/(.*)", "dest": "/styleguide/$1" }, - { "src": "/(?!res)(.*)", "dest": "/storybook/index.html" } + { "src": "/", "dest": "/storybook/index.html" } ] } From 2689d16554f6ae6cb20dc632d4ca2ee4962107fe Mon Sep 17 00:00:00 2001 From: Margarida Silva Date: Wed, 4 Nov 2020 12:50:58 +0000 Subject: [PATCH 06/33] Removed dll --- package.json | 2 +- vercel.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index e3f2fdb..8ce3259 100644 --- a/package.json +++ b/package.json @@ -33,7 +33,7 @@ "scripts": { "build": "cross-env NODE_ENV=production webpack --mode production --config webpack.config.js", "build-dev": "cross-env NODE_ENV=development webpack --mode development --config webpack.config.js", - "build-storybook": "cross-env NODE_ENV=development build-storybook -c .storybook -o dist/storybook --no-dll", + "build-storybook": "cross-env NODE_ENV=development build-storybook -c .storybook -o dist/storybook build", "dev": "cross-env NODE_ENV=development webpack-dev-server --config webpack.config.js --mode development --watch --hot", "docs": "vue-styleguidist server", "docs:build": "vue-styleguidist build", diff --git a/vercel.json b/vercel.json index 2d085cf..5a4df82 100644 --- a/vercel.json +++ b/vercel.json @@ -10,6 +10,6 @@ } ], "routes": [ - { "src": "/", "dest": "/storybook/index.html" } + { "src": "/(?!res)(.*)", "dest": "/storybook/index.html" } ] } From c3f9fb130f27c14576b2140d021e7e11c9a92910 Mon Sep 17 00:00:00 2001 From: Margarida Silva Date: Wed, 4 Nov 2020 12:55:26 +0000 Subject: [PATCH 07/33] Fix --- package.json | 2 +- vercel.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index 8ce3259..d5683e4 100644 --- a/package.json +++ b/package.json @@ -33,7 +33,7 @@ "scripts": { "build": "cross-env NODE_ENV=production webpack --mode production --config webpack.config.js", "build-dev": "cross-env NODE_ENV=development webpack --mode development --config webpack.config.js", - "build-storybook": "cross-env NODE_ENV=development build-storybook -c .storybook -o dist/storybook build", + "build-storybook": "cross-env NODE_ENV=development build-storybook -c .storybook -o dist/storybook", "dev": "cross-env NODE_ENV=development webpack-dev-server --config webpack.config.js --mode development --watch --hot", "docs": "vue-styleguidist server", "docs:build": "vue-styleguidist build", diff --git a/vercel.json b/vercel.json index 5a4df82..4a33ddc 100644 --- a/vercel.json +++ b/vercel.json @@ -10,6 +10,6 @@ } ], "routes": [ - { "src": "/(?!res)(.*)", "dest": "/storybook/index.html" } + { "src": "/storybook", "dest": "/storybook/index.html" } ] } From 3c3e192025848c49111979bfafc30ac2ddc88da8 Mon Sep 17 00:00:00 2001 From: Margarida Silva Date: Wed, 4 Nov 2020 13:43:16 +0000 Subject: [PATCH 08/33] Changed dist dir --- vercel.json | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/vercel.json b/vercel.json index 4a33ddc..6c07953 100644 --- a/vercel.json +++ b/vercel.json @@ -5,11 +5,8 @@ "src": "package.json", "use": "@vercel/static-build", "config": { - "distDir": "dist" + "distDir": "dist/storybook" } } - ], - "routes": [ - { "src": "/storybook", "dest": "/storybook/index.html" } ] } From 0d6d470c3f5791daac89ab879c5f8974580876c6 Mon Sep 17 00:00:00 2001 From: Margarida Silva Date: Wed, 4 Nov 2020 13:53:00 +0000 Subject: [PATCH 09/33] Revert vercel.json and changed storybook webpack --- .storybook/webpack.config.js | 26 ++++++++++++++------------ vercel.json | 6 +++++- 2 files changed, 19 insertions(+), 13 deletions(-) diff --git a/.storybook/webpack.config.js b/.storybook/webpack.config.js index 6cd0d8f..a600c72 100644 --- a/.storybook/webpack.config.js +++ b/.storybook/webpack.config.js @@ -1,15 +1,17 @@ const path = require("path"); -module.exports = async ({ config, mode }) => { - config.module.rules.push({ - test: /\.scss$/, - loaders: ["style-loader", "css-loader", "sass-loader"], - include: path.resolve(__dirname, "../") - }); - config.module.rules.push({ - test: /\.stories\.jsx?$/, - loaders: [require.resolve("@storybook/source-loader")], - enforce: "pre" - }); - return config; +module.exports = { + webpackFinal: (config) => { + config.module.rules.push({ + test: /\.scss$/, + loaders: ["style-loader", "css-loader", "sass-loader"], + include: path.resolve(__dirname, "../") + }); + config.module.rules.push({ + test: /\.stories\.jsx?$/, + loaders: [require.resolve("@storybook/source-loader")], + enforce: "pre" + }); + return config; + } }; diff --git a/vercel.json b/vercel.json index 6c07953..c796e55 100644 --- a/vercel.json +++ b/vercel.json @@ -5,8 +5,12 @@ "src": "package.json", "use": "@vercel/static-build", "config": { - "distDir": "dist/storybook" + "distDir": "dist" } } + ], + "routes": [ + { "src": "/storybook", "dest": "/storybook/index.html" }, + { "src": "/(?!res)(.*)", "dest": "/styleguide/$1" } ] } From 0ff607291663c683d401abf8ebee0f3e46af5ac7 Mon Sep 17 00:00:00 2001 From: Margarida Silva Date: Wed, 4 Nov 2020 14:01:26 +0000 Subject: [PATCH 10/33] Simplify approach --- package.json | 2 +- vercel.json | 6 +----- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/package.json b/package.json index d5683e4..5358b6f 100644 --- a/package.json +++ b/package.json @@ -33,7 +33,7 @@ "scripts": { "build": "cross-env NODE_ENV=production webpack --mode production --config webpack.config.js", "build-dev": "cross-env NODE_ENV=development webpack --mode development --config webpack.config.js", - "build-storybook": "cross-env NODE_ENV=development build-storybook -c .storybook -o dist/storybook", + "build-storybook": "cross-env NODE_ENV=development build-storybook -c .storybook -o storybook", "dev": "cross-env NODE_ENV=development webpack-dev-server --config webpack.config.js --mode development --watch --hot", "docs": "vue-styleguidist server", "docs:build": "vue-styleguidist build", diff --git a/vercel.json b/vercel.json index c796e55..12df50b 100644 --- a/vercel.json +++ b/vercel.json @@ -5,12 +5,8 @@ "src": "package.json", "use": "@vercel/static-build", "config": { - "distDir": "dist" + "distDir": "storybook" } } - ], - "routes": [ - { "src": "/storybook", "dest": "/storybook/index.html" }, - { "src": "/(?!res)(.*)", "dest": "/styleguide/$1" } ] } From 3326cdcf074b4dd2988c3058e518c37269cbe910 Mon Sep 17 00:00:00 2001 From: Margarida Silva Date: Wed, 4 Nov 2020 14:08:01 +0000 Subject: [PATCH 11/33] Another try --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 5358b6f..a6e9b66 100644 --- a/package.json +++ b/package.json @@ -33,7 +33,7 @@ "scripts": { "build": "cross-env NODE_ENV=production webpack --mode production --config webpack.config.js", "build-dev": "cross-env NODE_ENV=development webpack --mode development --config webpack.config.js", - "build-storybook": "cross-env NODE_ENV=development build-storybook -c .storybook -o storybook", + "build-storybook": "build-storybook -c .storybook -o storybook", "dev": "cross-env NODE_ENV=development webpack-dev-server --config webpack.config.js --mode development --watch --hot", "docs": "vue-styleguidist server", "docs:build": "vue-styleguidist build", From 843bbc9b0817d317fd5ee93b054fc8a7f1b63242 Mon Sep 17 00:00:00 2001 From: Margarida Silva Date: Wed, 4 Nov 2020 15:08:15 +0000 Subject: [PATCH 12/33] Another try --- .storybook/manager-head.html | 9 --------- vercel.json | 3 ++- 2 files changed, 2 insertions(+), 10 deletions(-) delete mode 100644 .storybook/manager-head.html diff --git a/.storybook/manager-head.html b/.storybook/manager-head.html deleted file mode 100644 index 80f257f..0000000 --- a/.storybook/manager-head.html +++ /dev/null @@ -1,9 +0,0 @@ - - - diff --git a/vercel.json b/vercel.json index 12df50b..5af9589 100644 --- a/vercel.json +++ b/vercel.json @@ -8,5 +8,6 @@ "distDir": "storybook" } } - ] + ], + "cleanUrl": false } From 60be75f76a22e307f0a6012cbeaafb8bd701cfc9 Mon Sep 17 00:00:00 2001 From: Margarida Silva Date: Wed, 4 Nov 2020 16:43:35 +0000 Subject: [PATCH 13/33] Try with forcing webpack version --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index a6e9b66..bf71e95 100644 --- a/package.json +++ b/package.json @@ -101,7 +101,7 @@ "vue-loader": "^15.9.5", "vue-styleguidist": "^4.33.5", "vue-template-compiler": "^2.6.12", - "webpack": "^5.4.0", + "webpack": "4.43.0", "webpack-cli": "^4.1.0", "webpack-dev-server": "^3.11.0" }, From d5ee2fcb9a5ae940178bdde4e179a60453e3e127 Mon Sep 17 00:00:00 2001 From: Margarida Silva Date: Wed, 4 Nov 2020 16:48:46 +0000 Subject: [PATCH 14/33] Revert storybook webpack config --- .storybook/webpack.config.js | 27 +++++++++++++-------------- 1 file changed, 13 insertions(+), 14 deletions(-) diff --git a/.storybook/webpack.config.js b/.storybook/webpack.config.js index a600c72..68d3f11 100644 --- a/.storybook/webpack.config.js +++ b/.storybook/webpack.config.js @@ -1,17 +1,16 @@ const path = require("path"); -module.exports = { - webpackFinal: (config) => { - config.module.rules.push({ - test: /\.scss$/, - loaders: ["style-loader", "css-loader", "sass-loader"], - include: path.resolve(__dirname, "../") - }); - config.module.rules.push({ - test: /\.stories\.jsx?$/, - loaders: [require.resolve("@storybook/source-loader")], - enforce: "pre" - }); - return config; - } +module.exports = async ({ config, mode }) => { + config.module.rules.push({ + test: /\.scss$/, + loaders: ["style-loader", "css-loader", "sass-loader"], + include: path.resolve(__dirname, "../") + }); + config.module.rules.push({ + test: /\.stories\.jsx?$/, + loaders: [require.resolve("@storybook/source-loader")], + enforce: "pre" + }); + console.log(config, mode); + return config; }; From ad9ea103522de46253aacb688846f873c02dbbae Mon Sep 17 00:00:00 2001 From: Margarida Silva Date: Wed, 4 Nov 2020 16:49:03 +0000 Subject: [PATCH 15/33] Fix --- .storybook/webpack.config.js | 1 - 1 file changed, 1 deletion(-) diff --git a/.storybook/webpack.config.js b/.storybook/webpack.config.js index 68d3f11..6cd0d8f 100644 --- a/.storybook/webpack.config.js +++ b/.storybook/webpack.config.js @@ -11,6 +11,5 @@ module.exports = async ({ config, mode }) => { loaders: [require.resolve("@storybook/source-loader")], enforce: "pre" }); - console.log(config, mode); return config; }; From b229fb43c7e3eaa50f0341f75dc8868e5b41fc7a Mon Sep 17 00:00:00 2001 From: Margarida Silva Date: Wed, 4 Nov 2020 16:53:26 +0000 Subject: [PATCH 16/33] Put back the routes --- vercel.json | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/vercel.json b/vercel.json index 5af9589..c796e55 100644 --- a/vercel.json +++ b/vercel.json @@ -5,9 +5,12 @@ "src": "package.json", "use": "@vercel/static-build", "config": { - "distDir": "storybook" + "distDir": "dist" } } ], - "cleanUrl": false + "routes": [ + { "src": "/storybook", "dest": "/storybook/index.html" }, + { "src": "/(?!res)(.*)", "dest": "/styleguide/$1" } + ] } From e655270bb2fd8a1bc1249631e9b47879cf18058d Mon Sep 17 00:00:00 2001 From: Margarida Silva Date: Wed, 4 Nov 2020 16:57:48 +0000 Subject: [PATCH 17/33] Fix script --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index bf71e95..2ded257 100644 --- a/package.json +++ b/package.json @@ -33,7 +33,7 @@ "scripts": { "build": "cross-env NODE_ENV=production webpack --mode production --config webpack.config.js", "build-dev": "cross-env NODE_ENV=development webpack --mode development --config webpack.config.js", - "build-storybook": "build-storybook -c .storybook -o storybook", + "build-storybook": "build-storybook -c .storybook -o dist/storybook", "dev": "cross-env NODE_ENV=development webpack-dev-server --config webpack.config.js --mode development --watch --hot", "docs": "vue-styleguidist server", "docs:build": "vue-styleguidist build", From 28372e6be346cdc30dd68299dbd00bcfa6b35560 Mon Sep 17 00:00:00 2001 From: Margarida Silva Date: Wed, 4 Nov 2020 17:13:00 +0000 Subject: [PATCH 18/33] More fixes --- package.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package.json b/package.json index 2ded257..a5f4b96 100644 --- a/package.json +++ b/package.json @@ -33,7 +33,7 @@ "scripts": { "build": "cross-env NODE_ENV=production webpack --mode production --config webpack.config.js", "build-dev": "cross-env NODE_ENV=development webpack --mode development --config webpack.config.js", - "build-storybook": "build-storybook -c .storybook -o dist/storybook", + "build-storybook": "build-storybook -c .storybook -o storybook", "dev": "cross-env NODE_ENV=development webpack-dev-server --config webpack.config.js --mode development --watch --hot", "docs": "vue-styleguidist server", "docs:build": "vue-styleguidist build", @@ -43,7 +43,7 @@ "lint-fix:stylelint": "stylelint \"./**/*.{css,scss,vue}\" --fix", "lint:base": "eslint \"./**/*.{js,vue}\"", "lint:stylelint": "stylelint \"./**/*.{css,scss,vue}\"", - "vercel-build": "npm run build && npm run build-storybook && npm run docs:build && cp -r res dist/", + "vercel-build": "npm run build && npm run build-storybook && npm run docs:build && cp -r storybook dist/ && cp -r res dist/", "prettier": "prettier \"./**/*.{js,vue,json}\" --write", "pretty": "npm run prettier && npm run lint-fix && npm run svgo", "storybook": "start-storybook -p 9001 -c .storybook", @@ -101,7 +101,7 @@ "vue-loader": "^15.9.5", "vue-styleguidist": "^4.33.5", "vue-template-compiler": "^2.6.12", - "webpack": "4.43.0", + "webpack": "<5.0.0", "webpack-cli": "^4.1.0", "webpack-dev-server": "^3.11.0" }, From 87b69fd6178d7fcbcd3594e52580acca6b5ed2c3 Mon Sep 17 00:00:00 2001 From: Margarida Silva Date: Wed, 4 Nov 2020 17:46:52 +0000 Subject: [PATCH 19/33] Change dist dir --- vercel.json | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/vercel.json b/vercel.json index c796e55..56956e4 100644 --- a/vercel.json +++ b/vercel.json @@ -3,14 +3,11 @@ "builds": [ { "src": "package.json", - "use": "@vercel/static-build", - "config": { - "distDir": "dist" - } + "use": "@vercel/static-build" } ], "routes": [ { "src": "/storybook", "dest": "/storybook/index.html" }, - { "src": "/(?!res)(.*)", "dest": "/styleguide/$1" } + { "src": "/(?!res)(.*)", "dest": "/dist/styleguide/$1" } ] } From 22d5a15037ea3d785866ed451fd48d402801017b Mon Sep 17 00:00:00 2001 From: Margarida Silva Date: Wed, 4 Nov 2020 17:53:31 +0000 Subject: [PATCH 20/33] Another setup --- package.json | 4 ++-- vercel.json | 9 ++++++--- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index a5f4b96..c028277 100644 --- a/package.json +++ b/package.json @@ -33,7 +33,7 @@ "scripts": { "build": "cross-env NODE_ENV=production webpack --mode production --config webpack.config.js", "build-dev": "cross-env NODE_ENV=development webpack --mode development --config webpack.config.js", - "build-storybook": "build-storybook -c .storybook -o storybook", + "build-storybook": "build-storybook -c .storybook -o dist/storybook", "dev": "cross-env NODE_ENV=development webpack-dev-server --config webpack.config.js --mode development --watch --hot", "docs": "vue-styleguidist server", "docs:build": "vue-styleguidist build", @@ -43,7 +43,7 @@ "lint-fix:stylelint": "stylelint \"./**/*.{css,scss,vue}\" --fix", "lint:base": "eslint \"./**/*.{js,vue}\"", "lint:stylelint": "stylelint \"./**/*.{css,scss,vue}\"", - "vercel-build": "npm run build && npm run build-storybook && npm run docs:build && cp -r storybook dist/ && cp -r res dist/", + "vercel-build": "npm run build && npm run build-storybook && npm run docs:build && cp -r res dist/", "prettier": "prettier \"./**/*.{js,vue,json}\" --write", "pretty": "npm run prettier && npm run lint-fix && npm run svgo", "storybook": "start-storybook -p 9001 -c .storybook", diff --git a/vercel.json b/vercel.json index 56956e4..c53c1dc 100644 --- a/vercel.json +++ b/vercel.json @@ -3,11 +3,14 @@ "builds": [ { "src": "package.json", - "use": "@vercel/static-build" + "use": "@vercel/static-build", + "config": { + "distDir": "dist" + } } ], "routes": [ - { "src": "/storybook", "dest": "/storybook/index.html" }, - { "src": "/(?!res)(.*)", "dest": "/dist/styleguide/$1" } + { "src": "/docs", "dest": "/styleguide/$1" }, + { "src": "/(?!res)(.*)", "dest": "/storybook/index.html" } ] } From 06ca73adeace0a8006bcd79b76dd346f1a44dcdf Mon Sep 17 00:00:00 2001 From: Margarida Silva Date: Wed, 4 Nov 2020 18:02:10 +0000 Subject: [PATCH 21/33] Try --- vercel.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/vercel.json b/vercel.json index c53c1dc..87aa0d0 100644 --- a/vercel.json +++ b/vercel.json @@ -10,7 +10,7 @@ } ], "routes": [ - { "src": "/docs", "dest": "/styleguide/$1" }, - { "src": "/(?!res)(.*)", "dest": "/storybook/index.html" } + { "src": "/(.*)", "dest": "/storybook/index.html" }, + { "src": "/docs/(.*)", "dest": "/styleguide/$1" } ] } From b9ef8084c87a2d7a2f03bcd32a960a74fdbda07d Mon Sep 17 00:00:00 2001 From: Margarida Silva Date: Wed, 4 Nov 2020 18:07:03 +0000 Subject: [PATCH 22/33] Simple --- vercel.json | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/vercel.json b/vercel.json index 87aa0d0..2d085cf 100644 --- a/vercel.json +++ b/vercel.json @@ -10,7 +10,6 @@ } ], "routes": [ - { "src": "/(.*)", "dest": "/storybook/index.html" }, - { "src": "/docs/(.*)", "dest": "/styleguide/$1" } + { "src": "/", "dest": "/storybook/index.html" } ] } From ce1dbf917af5a50019281ac5cc222ac10a813b46 Mon Sep 17 00:00:00 2001 From: Margarida Silva Date: Wed, 4 Nov 2020 18:11:07 +0000 Subject: [PATCH 23/33] Fix --- vercel.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vercel.json b/vercel.json index 2d085cf..8a52138 100644 --- a/vercel.json +++ b/vercel.json @@ -10,6 +10,6 @@ } ], "routes": [ - { "src": "/", "dest": "/storybook/index.html" } + { "src": "/(!?res)(*.)", "dest": "/storybook/index.html" } ] } From 4144a2a87340cae312942b27eed8ed0be0f5ffb7 Mon Sep 17 00:00:00 2001 From: Margarida Silva Date: Wed, 4 Nov 2020 18:14:35 +0000 Subject: [PATCH 24/33] Added styleguide route --- vercel.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/vercel.json b/vercel.json index 8a52138..55451b2 100644 --- a/vercel.json +++ b/vercel.json @@ -10,6 +10,7 @@ } ], "routes": [ - { "src": "/(!?res)(*.)", "dest": "/storybook/index.html" } + { "src": "/docs/(*.)", "dest": "/styleguide/$1" } + { "src": "/(!?res)(*.)", "dest": "/storybook/index.html" }, ] } From a3052b8b0fba77e86cbff584ce0eee6875815574 Mon Sep 17 00:00:00 2001 From: Margarida Silva Date: Wed, 4 Nov 2020 18:15:23 +0000 Subject: [PATCH 25/33] Fix --- vercel.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/vercel.json b/vercel.json index 55451b2..b1035f5 100644 --- a/vercel.json +++ b/vercel.json @@ -10,7 +10,7 @@ } ], "routes": [ - { "src": "/docs/(*.)", "dest": "/styleguide/$1" } - { "src": "/(!?res)(*.)", "dest": "/storybook/index.html" }, + { "src": "/docs/(*.)", "dest": "/styleguide/$1" }, + { "src": "/(!?res)(*.)", "dest": "/storybook/index.html" } ] } From 6c452a7f57c0732dd3db8d019fa508367f7374d4 Mon Sep 17 00:00:00 2001 From: Margarida Silva Date: Thu, 5 Nov 2020 08:46:59 +0000 Subject: [PATCH 26/33] Fix --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index c028277..4a07268 100644 --- a/package.json +++ b/package.json @@ -101,7 +101,7 @@ "vue-loader": "^15.9.5", "vue-styleguidist": "^4.33.5", "vue-template-compiler": "^2.6.12", - "webpack": "<5.0.0", + "webpack": "<=4.44.2", "webpack-cli": "^4.1.0", "webpack-dev-server": "^3.11.0" }, From b4382ef4c80efea532660a0cae5aaf2260096b02 Mon Sep 17 00:00:00 2001 From: Margarida Silva Date: Thu, 5 Nov 2020 09:03:53 +0000 Subject: [PATCH 27/33] Revert --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 4a07268..c028277 100644 --- a/package.json +++ b/package.json @@ -101,7 +101,7 @@ "vue-loader": "^15.9.5", "vue-styleguidist": "^4.33.5", "vue-template-compiler": "^2.6.12", - "webpack": "<=4.44.2", + "webpack": "<5.0.0", "webpack-cli": "^4.1.0", "webpack-dev-server": "^3.11.0" }, From 49c0ed1c0ca04396eae515084b146226e9efc7dd Mon Sep 17 00:00:00 2001 From: Margarida Silva Date: Thu, 5 Nov 2020 09:47:07 +0000 Subject: [PATCH 28/33] Revert manager-head and vercel --- .storybook/manager-head.html | 9 +++++++++ vercel.json | 4 ++-- 2 files changed, 11 insertions(+), 2 deletions(-) create mode 100644 .storybook/manager-head.html diff --git a/.storybook/manager-head.html b/.storybook/manager-head.html new file mode 100644 index 0000000..e21a719 --- /dev/null +++ b/.storybook/manager-head.html @@ -0,0 +1,9 @@ + + + \ No newline at end of file diff --git a/vercel.json b/vercel.json index b1035f5..c796e55 100644 --- a/vercel.json +++ b/vercel.json @@ -10,7 +10,7 @@ } ], "routes": [ - { "src": "/docs/(*.)", "dest": "/styleguide/$1" }, - { "src": "/(!?res)(*.)", "dest": "/storybook/index.html" } + { "src": "/storybook", "dest": "/storybook/index.html" }, + { "src": "/(?!res)(.*)", "dest": "/styleguide/$1" } ] } From 027a3883d7290a766026fe9fdcdd7f1c13e39877 Mon Sep 17 00:00:00 2001 From: Margarida Silva Date: Thu, 5 Nov 2020 10:53:20 +0000 Subject: [PATCH 29/33] Fix documentation and reverted unnecessary changes --- .storybook/manager-head.html | 2 +- package.json | 7 ++++--- vercel.json | 2 +- webpack.config.js | 21 +++++++++++++++++++-- 4 files changed, 25 insertions(+), 7 deletions(-) diff --git a/.storybook/manager-head.html b/.storybook/manager-head.html index e21a719..d6cee83 100644 --- a/.storybook/manager-head.html +++ b/.storybook/manager-head.html @@ -6,4 +6,4 @@ document.getElementsByTagName('head')[0].appendChild(script); } - \ No newline at end of file + diff --git a/package.json b/package.json index bed83f1..884c62e 100644 --- a/package.json +++ b/package.json @@ -33,7 +33,7 @@ "scripts": { "build": "cross-env NODE_ENV=production webpack --mode production --config webpack.config.js", "build-dev": "cross-env NODE_ENV=development webpack --mode development --config webpack.config.js", - "build-storybook": "build-storybook -c .storybook -o dist/storybook", + "build-storybook": "cross-env NODE_ENV=development build-storybook -c .storybook -o dist/storybook", "dev": "cross-env NODE_ENV=development webpack-dev-server --config webpack.config.js --mode development --watch --hot", "docs": "vue-styleguidist server", "docs:build": "vue-styleguidist build", @@ -43,7 +43,7 @@ "lint-fix:stylelint": "stylelint \"./**/*.{css,scss,vue}\" --fix", "lint:base": "eslint \"./**/*.{js,vue}\"", "lint:stylelint": "stylelint \"./**/*.{css,scss,vue}\"", - "vercel-build": "npm run build && npm run build-storybook && npm run docs:build && cp -r res dist/", + "now-build": "npm run build && npm run build-storybook && npm run docs:build && cp -r res dist/", "prettier": "prettier \"./**/*.{js,vue,json}\" --write", "pretty": "npm run prettier && npm run lint-fix && npm run svgo", "storybook": "start-storybook -p 9001 -c .storybook", @@ -65,6 +65,7 @@ }, "devDependencies": { "@babel/core": "^7.12.3", + "@babel/plugin-transform-runtime": "^7.12.1", "@babel/preset-env": "^7.12.1", "@storybook/addon-knobs": "^6.0.28", "@storybook/addon-storysource": "^6.0.28", @@ -101,7 +102,7 @@ "vue-loader": "^15.9.5", "vue-styleguidist": "^4.33.5", "vue-template-compiler": "^2.6.12", - "webpack": "<5.0.0", + "webpack": "^4.44.2", "webpack-cli": "^4.2.0", "webpack-dev-server": "^3.11.0" }, diff --git a/vercel.json b/vercel.json index c796e55..90c94ea 100644 --- a/vercel.json +++ b/vercel.json @@ -3,7 +3,7 @@ "builds": [ { "src": "package.json", - "use": "@vercel/static-build", + "use": "@now/static-build", "config": { "distDir": "dist" } diff --git a/webpack.config.js b/webpack.config.js index ffd37b5..f672f38 100644 --- a/webpack.config.js +++ b/webpack.config.js @@ -61,6 +61,7 @@ module.exports = { { loader: "babel-loader", options: { + sourceType: "unambiguous", presets: [ process.env.NODE_ENV === "development" ? [ @@ -68,10 +69,26 @@ module.exports = { { targets: { browsers: ["last 2 years"] - } + }, + useBuiltIns: "entry", + corejs: "3" } ] - : "@babel/preset-env" + : [ + "@babel/preset-env", + { + useBuiltIns: "entry", + corejs: "3" + } + ] + ], + plugins: [ + [ + "@babel/plugin-transform-runtime", + { + regenerator: true + } + ] ] } }, From 9804c0907dc074a51b956df253c09fde79d50de4 Mon Sep 17 00:00:00 2001 From: Margarida Silva Date: Thu, 5 Nov 2020 11:12:58 +0000 Subject: [PATCH 30/33] Cleanup --- .storybook/manager-head.html | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/.storybook/manager-head.html b/.storybook/manager-head.html index d6cee83..80f257f 100644 --- a/.storybook/manager-head.html +++ b/.storybook/manager-head.html @@ -1,9 +1,9 @@ - - - + + + From bd73bf5abc0e562369bb27321a0b49409608d875 Mon Sep 17 00:00:00 2001 From: Margarida Silva Date: Thu, 5 Nov 2020 11:18:00 +0000 Subject: [PATCH 31/33] Removed unnecessary config --- webpack.config.js | 1 - 1 file changed, 1 deletion(-) diff --git a/webpack.config.js b/webpack.config.js index f672f38..197a2c1 100644 --- a/webpack.config.js +++ b/webpack.config.js @@ -61,7 +61,6 @@ module.exports = { { loader: "babel-loader", options: { - sourceType: "unambiguous", presets: [ process.env.NODE_ENV === "development" ? [ From 4b4a694ef3dc46bd8c61b7d2dde8f0709f92e0ae Mon Sep 17 00:00:00 2001 From: Margarida Silva Date: Thu, 5 Nov 2020 11:49:07 +0000 Subject: [PATCH 32/33] Moved regenerator runtime to styleguide config --- styleguide.config.js | 45 +++++++++++++++++++++++++++++++++++++++++++- webpack.config.js | 20 ++------------------ 2 files changed, 46 insertions(+), 19 deletions(-) diff --git a/styleguide.config.js b/styleguide.config.js index 6c72a58..54cbb5a 100644 --- a/styleguide.config.js +++ b/styleguide.config.js @@ -1,6 +1,49 @@ +const { conf } = require("yonius"); +const config = require("./webpack.config"); + +// remove babel-loader rule and replace it with one that includes +// the regeneratorRuntime +config.module.rules = config.module.rules.filter(rule => String(rule.test) !== String(/\.js$/)); +config.module.rules.push({ + test: /\.js$/, + exclude: /node_modules\/(?!ripe-sdk)/, + use: [ + { + loader: "babel-loader", + options: { + presets: [ + process.env.NODE_ENV === "development" + ? [ + "@babel/preset-env", + { + targets: { + browsers: ["last 2 years"] + }, + useBuiltIns: "entry", + corejs: "3" + } + ] + : "@babel/preset-env" + ], + plugins: [ + [ + "@babel/plugin-transform-runtime", + { + regenerator: true + } + ] + ] + } + }, + { + loader: "eslint-loader" + } + ] +}); + module.exports = { styleguideDir: "dist/styleguide", - webpackConfig: Object.assign({}, require("./webpack.config"), { + webpackConfig: Object.assign({}, config, { externals: {} }), sections: [ diff --git a/webpack.config.js b/webpack.config.js index 197a2c1..ffd37b5 100644 --- a/webpack.config.js +++ b/webpack.config.js @@ -68,26 +68,10 @@ module.exports = { { targets: { browsers: ["last 2 years"] - }, - useBuiltIns: "entry", - corejs: "3" + } } ] - : [ - "@babel/preset-env", - { - useBuiltIns: "entry", - corejs: "3" - } - ] - ], - plugins: [ - [ - "@babel/plugin-transform-runtime", - { - regenerator: true - } - ] + : "@babel/preset-env" ] } }, From a991b0c4e62e0e55f0a42271428e8e93f8af476e Mon Sep 17 00:00:00 2001 From: Margarida Silva Date: Thu, 5 Nov 2020 11:54:04 +0000 Subject: [PATCH 33/33] Fix --- styleguide.config.js | 1 - 1 file changed, 1 deletion(-) diff --git a/styleguide.config.js b/styleguide.config.js index 54cbb5a..4bcc5dc 100644 --- a/styleguide.config.js +++ b/styleguide.config.js @@ -1,4 +1,3 @@ -const { conf } = require("yonius"); const config = require("./webpack.config"); // remove babel-loader rule and replace it with one that includes