Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Migrate from vue-cli-service to vite #15389

Open
wants to merge 18 commits into
base: develop
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
18 changes: 9 additions & 9 deletions .babelrc
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
{
"presets": [
[
"@babel/preset-env",
{
"targets": {
"node": true
"presets": [
[
"@babel/preset-env",
{
"targets": {
"node": true
}
}
}
]
]
]
}
}
11 changes: 0 additions & 11 deletions gulp/gulp-start.js

This file was deleted.

6 changes: 0 additions & 6 deletions gulp/gulp-tests.js
Original file line number Diff line number Diff line change
Expand Up @@ -49,12 +49,6 @@ function integrationTestCommand (testDir) {
}

/* Test task definitions */
gulp.task('test:nodemon', gulp.series(done => {
process.env.PORT = TEST_SERVER_PORT; // eslint-disable-line no-process-env
process.env.NODE_DB_URI = TEST_DB_URI; // eslint-disable-line no-process-env
done();
}, 'nodemon'));

gulp.task('test:prepare:mongo', cb => {
const mongooseOptions = getDefaultConnectionOptions();
const connectionUrl = getDevelopmentConnectionUrl(TEST_DB_URI);
Expand Down
1 change: 0 additions & 1 deletion gulpfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@ if (process.env.NODE_ENV === 'production') { // eslint-disable-line no-process-e
require('./gulp/gulp-build'); // eslint-disable-line global-require
require('./gulp/gulp-console'); // eslint-disable-line global-require
require('./gulp/gulp-sprites'); // eslint-disable-line global-require
require('./gulp/gulp-start'); // eslint-disable-line global-require
require('./gulp/gulp-tests'); // eslint-disable-line global-require
require('./gulp/gulp-transifex-test'); // eslint-disable-line global-require
require('gulp').task('default', gulp.series('test')); // eslint-disable-line global-require
Expand Down
2 changes: 1 addition & 1 deletion habitica-images
Submodule habitica-images updated 668 files
2 changes: 1 addition & 1 deletion migrations/archive/api_v3/groups.js
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ let consoleStamp = require('console-stamp');
consoleStamp(console);

// Initialize configuration
require('../../website/server/libs/api-v3/setupNconf')();
require('../../website/server/libs/api-v3/setupNconf').default();

let MONGODB_OLD = nconf.get('MONGODB_OLD');
let MONGODB_NEW = nconf.get('MONGODB_NEW');
Expand Down
2 changes: 1 addition & 1 deletion migrations/archive/api_v3/users.js
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ let moment = require('moment');
consoleStamp(console);

// Initialize configuration
require('../../website/server/libs/api-v3/setupNconf')();
require('../../website/server/libs/api-v3/setupNconf').default();

let MONGODB_OLD = nconf.get('MONGODB_OLD');
let MONGODB_NEW = nconf.get('MONGODB_NEW');
Expand Down
2 changes: 1 addition & 1 deletion migrations/migration-runner.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ require('@babel/register'); // eslint-disable-line import/no-extraneous-dependen
function setUpServer () {
const nconf = require('nconf'); // eslint-disable-line global-require, no-unused-vars
const mongoose = require('mongoose'); // eslint-disable-line global-require, no-unused-vars
const setupNconf = require('../website/server/libs/setupNconf'); // eslint-disable-line global-require
const setupNconf = require('../website/server/libs/setupNconf').default; // eslint-disable-line global-require

setupNconf();

Expand Down
Loading
Loading