Skip to content

Commit 2d525f0

Browse files
gesseekurgesseekur
committedJun 5, 2020
Revert and test
1 parent a5d2364 commit 2d525f0

File tree

8 files changed

+5703
-1779
lines changed

8 files changed

+5703
-1779
lines changed
 

‎.storybook/webpack.config.js

+5-7
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,17 @@
11
const path = require('path');
2-
// Try the environment variable, otherwise use root
3-
const ASSET_PATH = process.env.ASSET_PATH || '/';
42

53
// Export a function. Accept the base config as the only param.
64
module.exports = async ({ config, mode }) => {
7-
config.output.push({
8-
publicPath: ASSET_PATH,
9-
})
5+
// config.output = {
6+
// baseUrl: '.',
7+
// }
108
// storybookBaseConfig.output.publicPath = 'http://localhost:6006/'
119
config.resolve.extensions.push('.vue');
1210
config.resolve.alias['@'] = path.resolve(__dirname, '../src');
1311
// `mode` has a value of 'DEVELOPMENT' or 'PRODUCTION'
1412
// You can change the configuration based on that.
1513
// 'PRODUCTION' is used when building the static version of storybook.
16-
14+
1715
config.module.rules.push({
1816
test: /\.stories\.js?$/,
1917
loaders: [require.resolve('@storybook/source-loader')],
@@ -33,7 +31,7 @@ module.exports = async ({ config, mode }) => {
3331
implementation: require('sass'),
3432
sassOptions: {
3533
fiber: require('fibers'),
36-
indentedSyntax: true // optional
34+
indentedSyntax: true // optional,
3735
}
3836
}
3937
}

‎jsconfig.json

+9
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
{
2+
"compilerOptions": {
3+
"baseUrl": ".",
4+
"paths": {
5+
"@/*": ["./src/*"]
6+
}
7+
},
8+
"exclude": ["node_modules", "tests"]
9+
}

‎package-lock.json

+5,127-362
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎package.json

+9-5
Original file line numberDiff line numberDiff line change
@@ -29,14 +29,16 @@
2929
"eslint-config-eslint": "^6.0.0",
3030
"fibers": "^5.0.0",
3131
"git-url-parse": "^11.1.2",
32-
"material-design-icons": "^3.0.1",
3332
"material-design-icons-iconfont": "^5.0.1",
3433
"minimist": "^1.2.5",
3534
"rollup-plugin-replace": "^2.2.0",
3635
"rollup-plugin-uglify-es": "0.0.1",
36+
"style-loader": "^1.2.1",
3737
"vue": "^2.6.10",
38-
"vue-cli-plugin-style-resources-loader": "^0.1.4",
38+
"vue-cli-plugin-style-resources-loader": "~0.1.4",
39+
"vue-loader": "^15.9.2",
3940
"vue-router": "^3.0.3",
41+
"vue-style-loader": "^4.1.2",
4042
"vuetify": "^2.2.23",
4143
"vuex": "^3.2.0"
4244
},
@@ -56,10 +58,12 @@
5658
"@storybook/source-loader": "^5.3.17",
5759
"@storybook/storybook-deployer": "^2.8.5",
5860
"@storybook/vue": "^5.3.18",
61+
"@vue/cli": "^4.4.1",
5962
"@vue/cli-plugin-babel": "4.4.1",
6063
"@vue/cli-plugin-eslint": "4.4.1",
6164
"@vue/cli-service": "4.4.1",
6265
"@vue/eslint-config-prettier": "^5.0.0",
66+
"@vue/web-component-wrapper": "^1.2.0",
6367
"babel-eslint": "^10.0.1",
6468
"babel-loader": "^8.0.6",
6569
"babel-preset-vue": "^2.0.2",
@@ -72,10 +76,10 @@
7276
"rollup-plugin-buble": "^0.19.8",
7377
"rollup-plugin-commonjs": "^10.0.1",
7478
"rollup-plugin-vue": "^5.0.1",
75-
"sass": "^1.26.5",
76-
"sass-loader": "^7.1.0",
79+
"sass-loader": "^7.0.2",
80+
"style-resources-loader": "^1.3.3",
7781
"vue-cli-plugin-vuetify": "^2.0.5",
78-
"vue-template-compiler": "^2.6.10",
82+
"vue-template-compiler": "^2.6.11",
7983
"vuetify-loader": "^1.2.2"
8084
},
8185
"files": [

‎src/assets/styles/setup/_fonts.scss

+8-8
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
font-style: normal;
55
font-weight: 100;
66
src: local('Roboto Thin'), local('Roboto-Thin'),
7-
url('/assets/fonts/Roboto/roboto-v20-latin-100.eot?#iefix') format('embedded-opentype'),
7+
url('/assets/fonts/Roboto/roboto-v20-latin-100.eot?#iefi') format('embedded-opentype'),
88
/* IE6-IE8 */
99
url('/assets/fonts/Roboto/roboto-v20-latin-100.woff2') format('woff2'),
1010
/* Super Modern Browsers */
@@ -48,7 +48,7 @@
4848
/* IE6-IE8 */
4949
url('/assets/fonts/Roboto/roboto-v20-latin-regular.woff2') format('woff2'),
5050
/* Super Modern Browsers */
51-
url('/assets/fonts/Roboto/roboto-v20-latin-regular.woff') format('woff'),
51+
url('/assets/roboto-v20-latin-regular.woff') format('woff'),
5252
/* Modern Browsers */
5353
url('/assets/fonts/Roboto/roboto-v20-latin-regular.ttf') format('truetype'),
5454
/* Safari, Android, iOS */
@@ -123,19 +123,19 @@
123123
font-weight: 400;
124124
src: url('/assets/fonts/pt-mono-v7-latin-regular.eot'); /* IE9 Compat Modes */
125125
src: local('PT Mono'), local('PTMono-Regular'),
126-
url('/assets/fonts/pt-mono-v7-latin-regular.eot?#iefix') format('embedded-opentype'), /* IE6-IE8 */
127-
url('/assets/fonts/pt-mono-v7-latin-regular.woff2') format('woff2'), /* Super Modern Browsers */
128-
url('/assets/fonts/pt-mono-v7-latin-regular.woff') format('woff'), /* Modern Browsers */
129-
url('/assets/fonts/pt-mono-v7-latin-regular.ttf') format('truetype'), /* Safari, Android, iOS */
130-
url('/assets/fonts/pt-mono-v7-latin-regular.svg#PTMono') format('svg'); /* Legacy iOS */
126+
url('/assets/fonts/PT-Mono/pt-mono-v7-latin-regular.eot?#iefix') format('embedded-opentype'), /* IE6-IE8 */
127+
url('/assets/fonts/PT-Mono/pt-mono-v7-latin-regular.woff2') format('woff2'), /* Super Modern Browsers */
128+
url('/assets/fonts/PT-Mono/pt-mono-v7-latin-regular.woff') format('woff'), /* Modern Browsers */
129+
url('/assets/fonts/PT-Mono/pt-mono-v7-latin-regular.ttf') format('truetype'), /* Safari, Android, iOS */
130+
url('/assets/fonts/PT-Mono/pt-mono-v7-latin-regular.svg#PTMono') format('svg'); /* Legacy iOS */
131131
}
132132

133133

134134
@font-face {
135135
font-family: 'Material Icons';
136136
font-style: normal;
137137
font-weight: 400;
138-
src: url('/assets/fonts/Material-Icons/MaterialIcons-Regular.eot'); /* For IE6-8 */
138+
src: url('/assets/fonts/MaterialIcons-Regular.eot'); /* For IE6-8 */
139139
src: local('Material Icons'),
140140
local('MaterialIcons-Regular'),
141141
url('/assets/fonts/Material-Icons/MaterialIcons-Regular.woff2') format('woff2'),

‎src/main.js

+4-1
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,11 @@
1+
/* eslint-disable no-unused-vars */
12
import Vue from 'vue';
23
import router from './router';
34
import store from './store';
45
import vuetify from './plugins/vuetify';
5-
6+
import MaterialIcons from './assets/fonts/Material-Icons';
7+
import Roboto from './assets/fonts/Roboto';
8+
import PtMono from './assets/fonts/PT-Mono';
69
Vue.config.productionTip = false;
710

811
new Vue({

‎vue.config.js

+25
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,29 @@
11
module.exports = {
2+
assetsDir: 'assets/',
3+
publicPath: '/', // Base directory for dev
4+
css: {
5+
sourceMap: true,
6+
loaderOptions: {
7+
sass: {
8+
data: `@import "@/assets/styles/global.scss";`
9+
}
10+
}
11+
},
12+
chainWebpack: config => {
13+
config.module
14+
.rule("fonts")
15+
.test(/\.(ttf|otf|eot|woff|woff2)$/)
16+
.use("file-loader")
17+
.loader("file-loader")
18+
.tap(options => {
19+
options = {
20+
// limit: 10000,
21+
name: '/assets/fonts/[name].[ext]',
22+
}
23+
return options
24+
})
25+
.end()
26+
},
227
pluginOptions: {
328
'style-resources-loader': {
429
preProcessor: 'scss',

‎yarn.lock

+516-1,396
Large diffs are not rendered by default.

0 commit comments

Comments
 (0)
Please sign in to comment.