Skip to content
Snippets Groups Projects
Unverified Commit 2e7cbc5e authored by Roeland Jago Douma's avatar Roeland Jago Douma
Browse files

Move oauth2 to global webpack config

parent 329da5fb
No related branches found
No related tags found
No related merge requests found
all: dev-setup build-js-production
dev-setup: clean clean-dev npm-init
npm-init:
npm install
npm-update:
npm update
build-js:
npm run dev
build-js-production:
npm run build
watch-js:
npm run watch
clean:
rm -f js/oauth2.js
rm -f js/oauth2.js.map
clean-dev:
rm -rf node_modules
File suppressed by a .gitattributes entry or the file's encoding is unsupported.
File suppressed by a .gitattributes entry or the file's encoding is unsupported.
This diff is collapsed.
{
"name": "oauth2",
"version": "1.1.0",
"description": "OAuth2 setup",
"author": "Roeland Jago Douma <roeland@famdouma.nl>",
"license": "AGPL-3.0-or-later",
"main": "init.js",
"directories": {
"lib": "lib",
"test": "tests"
},
"scripts": {
"dev": "webpack --config webpack.dev.js",
"watch": "webpack --progress --watch --config webpack.dev.js",
"build": "webpack --progress --hide-modules --config webpack.prod.js",
"test": "echo \"Error: no test specified\" && exit 1"
},
"dependencies": {
"nextcloud-axios": "^0.1.3",
"vue": "^2.6.4"
},
"devDependencies": {
"css-loader": "^2.1.0",
"file-loader": "^3.0.1",
"vue-loader": "^15.6.2",
"vue-template-compiler": "^2.6.4",
"webpack": "^4.29.2",
"webpack-cli": "^3.2.3",
"webpack-merge": "^4.2.1"
}
}
const merge = require('webpack-merge');
const common = require('./webpack.common.js');
module.exports = merge(common, {
mode: 'development',
devServer: {
historyApiFallback: true,
noInfo: true,
overlay: true
},
devtool: '#eval-source-map',
})
...@@ -13,6 +13,9 @@ module.exports = { ...@@ -13,6 +13,9 @@ module.exports = {
{ {
test: /\.vue$/, test: /\.vue$/,
loader: 'vue-loader', loader: 'vue-loader',
options: {
hotReload: false
}
}, },
{ {
test: /\.css$/, test: /\.css$/,
......
const merge = require('webpack-merge')
const common = require('./webpack.common.js')
module.exports = merge(common, {
mode: 'production',
devtool: '#source-map'
})
This diff is collapsed.
...@@ -9,7 +9,8 @@ ...@@ -9,7 +9,8 @@
}, },
"scripts": { "scripts": {
"build": "webpack --progress --hide-modules --config webpack.prod.js", "build": "webpack --progress --hide-modules --config webpack.prod.js",
"dev": "webpack --progress --watch --config webpack.dev.js" "dev": "webpack --progress --watch --config webpack.dev.js",
"watch": "webpack --progress --watch --config webpack.dev.js"
}, },
"repository": { "repository": {
"type": "git", "type": "git",
...@@ -38,9 +39,11 @@ ...@@ -38,9 +39,11 @@
"jstimezonedetect": "^1.0.6", "jstimezonedetect": "^1.0.6",
"marked": "^0.6.0", "marked": "^0.6.0",
"moment": "^2.24.0", "moment": "^2.24.0",
"nextcloud-axios": "^0.1.3",
"snap.js": "^2.0.9", "snap.js": "^2.0.9",
"strengthify": "git+https://github.com/MorrisJobke/strengthify.git", "strengthify": "git+https://github.com/MorrisJobke/strengthify.git",
"underscore": "^1.9.1" "underscore": "^1.9.1",
"vue": "^2.6.5"
}, },
"devDependencies": { "devDependencies": {
"@babel/core": "^7.2.2", "@babel/core": "^7.2.2",
...@@ -49,11 +52,14 @@ ...@@ -49,11 +52,14 @@
"babel-loader": "^8.0.5", "babel-loader": "^8.0.5",
"css-loader": "^2.1.0", "css-loader": "^2.1.0",
"exports-loader": "^0.7.0", "exports-loader": "^0.7.0",
"file-loader": "^3.0.1",
"handlebars-loader": "^1.7.1", "handlebars-loader": "^1.7.1",
"node-sass": "^4.11.0", "node-sass": "^4.11.0",
"sass-loader": "^7.1.0", "sass-loader": "^7.1.0",
"style-loader": "^0.23.1", "style-loader": "^0.23.1",
"url-loader": "^1.1.2", "url-loader": "^1.1.2",
"vue-loader": "^15.6.2",
"vue-template-compiler": "^2.6.5",
"webpack": "^4.29.3", "webpack": "^4.29.3",
"webpack-cli": "^3.2.3", "webpack-cli": "^3.2.3",
"webpack-merge": "^4.2.1" "webpack-merge": "^4.2.1"
......
const core = require('./core/webpack'); const core = require('./core/webpack');
const oauth2 = require('./apps/oauth2/webpack')
module.exports = [].concat(core); module.exports = [].concat(core, oauth2);
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment