Skip to content

Commit c216faf

Browse files
authored
Merge pull request #3 from oslabs-beta/pinia
Final merge of Pinia in main Dev branch. Finished with conversion of store from Vuex to Pinia.
2 parents c647f75 + 36eedcf commit c216faf

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

56 files changed

+5265
-3263
lines changed

package-lock.json

Lines changed: 74 additions & 6 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,7 @@
4747
"mousetrap": "^1.6.5",
4848
"net": "^1.0.2",
4949
"node-gyp": "^8.4.1",
50+
"pinia": "^2.0.23",
5051
"prismjs": "^1.27.0",
5152
"quasar": "^2.5.5",
5253
"quasar-dotenv": "^1.0.5",

quasar.conf.js

Lines changed: 22 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ module.exports = configure(function (ctx) {
3434
extras: [
3535
// 'ionicons-v4',
3636
// 'mdi-v5',
37-
// 'fontawesome-v5',
37+
// 'fontawe me-v5',
3838
// 'eva-icons',
3939
// 'themify',
4040
// 'line-awesome',
@@ -57,7 +57,7 @@ module.exports = configure(function (ctx) {
5757
// extendWebpack(cfg) {
5858
// cfg.target = 'electron-main'
5959
// },
60-
60+
6161
// transpile: false,
6262
// publicPath: '/',
6363

@@ -77,23 +77,24 @@ module.exports = configure(function (ctx) {
7777

7878
// https://quasar.dev/quasar-cli/handling-webpack
7979
// "chain" is a webpack-chain object https://github.com/neutrinojs/webpack-chain
80-
chainWebpack (chain) {
81-
chain.plugin('eslint-webpack-plugin')
82-
.use(ESLintPlugin, [{ extensions: [ 'js', 'vue' ] }]);
83-
84-
chain.resolve.alias.set('child_process', false);// Added this
85-
chain.resolve.alias.set('crypto', false);
86-
chain.resolve.alias.set('fs', false);
87-
chain.resolve.alias.set('http', false);
88-
chain.resolve.alias.set('https', false);
89-
chain.resolve.alias.set('os', false);
90-
chain.resolve.alias.set('path', false);
91-
chain.resolve.alias.set('stream', false);
92-
chain.resolve.alias.set('tls', false);
93-
chain.resolve.alias.set('tty', false);
94-
chain.resolve.alias.set('url', false);
95-
chain.resolve.alias.set('util', false);
96-
chain.resolve.alias.set('zlib', false);
80+
chainWebpack(chain) {
81+
chain
82+
.plugin("eslint-webpack-plugin")
83+
.use(ESLintPlugin, [{ extensions: ["js", "vue"] }]);
84+
85+
chain.resolve.alias.set("child_process", false); // Added this
86+
chain.resolve.alias.set("crypto", false);
87+
chain.resolve.alias.set("fs", false);
88+
chain.resolve.alias.set("http", false);
89+
chain.resolve.alias.set("https", false);
90+
chain.resolve.alias.set("os", false);
91+
chain.resolve.alias.set("path", false);
92+
chain.resolve.alias.set("stream", false);
93+
chain.resolve.alias.set("tls", false);
94+
chain.resolve.alias.set("tty", false);
95+
chain.resolve.alias.set("url", false);
96+
chain.resolve.alias.set("util", false);
97+
chain.resolve.alias.set("zlib", false);
9798
},
9899
},
99100

@@ -104,7 +105,7 @@ module.exports = configure(function (ctx) {
104105
},
105106
port: 8080,
106107
open: true, // opens browser window automatically
107-
vueDevtools: true
108+
vueDevtools: true,
108109
},
109110

110111
// https://quasar.dev/quasar-cli/quasar-conf-js#Property%3A-framework
@@ -264,4 +265,4 @@ module.exports = configure(function (ctx) {
264265
},
265266
};
266267
});
267-
``
268+
``;

0 commit comments

Comments
 (0)