Move twofactor_backupcodes to main webpack bundle

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
This commit is contained in:
Roeland Jago Douma 2019-02-20 15:24:04 +01:00
parent 0becd88feb
commit f5449a021a
No known key found for this signature in database
GPG Key ID: F941078878347C0C
8 changed files with 2 additions and 5131 deletions

View File

@ -24,13 +24,6 @@ pipeline:
when:
matrix:
TESTS: webpack-build
vue-build-backupcodes:
image: node
commands:
- ./build/vue-builds.sh ./apps/twofactor_backupcodes/js/settings.js
when:
matrix:
TESTS: vue-build-backupscodes
checkers:
image: nextcloudci/php7.1:php7.1-16
commands:
@ -779,7 +772,6 @@ matrix:
include:
- TESTS: checkers
- TESTS: webpack-build
- TESTS: vue-build-backupcodes
- TESTS: handlebars
- TESTS: nodb-codecov
ENABLE_REDIS: true

View File

@ -1,25 +0,0 @@
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/settings.js
rm -f js/settings.js.map
clean-dev:
rm -rf node_modules

File diff suppressed because it is too large Load Diff

View File

@ -1,33 +0,0 @@
{
"name": "twofactor_backupcodes",
"version": "1.0.0",
"description": "Nextcloud Two-Factor Backup Codes",
"main": "index.js",
"directories": {
"lib": "lib",
"test": "tests"
},
"scripts": {
"build": "webpack --progress --hide-modules --config webpack.prod.js",
"dev": "webpack --progress --watch --config webpack.dev.js",
"test": "echo \"Error: no test specified\" && exit 1"
},
"author": "",
"license": "AGPL-3.0-or-later",
"dependencies": {
"nextcloud-axios": "^0.1.3",
"nextcloud-password-confirmation": "^0.1.0",
"vue": "^2.5.22",
"vuex": "^3.0.1"
},
"devDependencies": {
"@babel/core": "^7.2.2",
"babel-loader": "^8.0.5",
"css-loader": "^2.1.0",
"vue-loader": "^15.5.1",
"vue-template-compiler": "^2.5.22",
"webpack": "^4.28.4",
"webpack-cli": "^3.2.1",
"webpack-merge": "^4.2.1"
}
}

View File

@ -1,12 +0,0 @@
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',
})

View File

@ -1,7 +0,0 @@
const merge = require('webpack-merge')
const common = require('./webpack.common.js')
module.exports = merge(common, {
mode: 'production',
devtool: '#source-map'
})

View File

@ -7,6 +7,7 @@ const files_trashbin = require('./apps/files_trashbin/webpack')
const files_versions = require('./apps/files_versions/webpack')
const oauth2 = require('./apps/oauth2/webpack')
const systemtags = require('./apps/systemtags/webpack')
const twofactor_backupscodes = require('./apps/twofactor_backupcodes/webpack')
const updatenotifications = require('./apps/updatenotification/webpack')
module.exports = [].concat(
@ -18,5 +19,6 @@ module.exports = [].concat(
files_versions,
oauth2,
systemtags,
twofactor_backupscodes,
updatenotifications
);