From 2ae971a7ad1eaa1ea4f45c8591b911f1c333a51b Mon Sep 17 00:00:00 2001 From: Alexis Lahouze Date: Mon, 10 Jul 2017 15:51:58 +0200 Subject: [PATCH] Typescript conversion. --- .../{account.config.js => account.config.ts} | 0 .../{account.controller.js => account.controller.ts} | 0 .../{account.factory.js => account.factory.ts} | 0 ...alances.factory.js => accountBalances.factory.ts} | 0 src/accounts/{index.js => index.ts} | 8 ++++---- src/{app.config.js => app.config.ts} | 0 src/{app.js => app.ts} | 12 ++++++------ src/{bootstrap.config.js => bootstrap.config.ts} | 0 src/login/{index.js => index.ts} | 0 src/login/{login.config.js => login.config.ts} | 0 src/login/{login.service.js => login.service.ts} | 0 ...chart.component.js => balance-chart.component.ts} | 0 ...hart.component.js => category-chart.component.ts} | 0 src/operations/{index.js => index.ts} | 9 +++++---- .../{operation.config.js => operation.config.ts} | 0 ...eration.controller.js => operation.controller.ts} | 0 .../{operation.factory.js => operation.factory.ts} | 0 src/scheduler/{index.js => index.ts} | 6 +++--- .../{schedule.config.js => schedule.config.ts} | 0 ...schedule.controller.js => schedule.controller.ts} | 0 .../{schedule.factory.js => schedule.factory.ts} | 0 webpack.config.js | 11 ++++++++++- 22 files changed, 28 insertions(+), 18 deletions(-) rename src/accounts/{account.config.js => account.config.ts} (100%) rename src/accounts/{account.controller.js => account.controller.ts} (100%) rename src/accounts/{account.factory.js => account.factory.ts} (100%) rename src/accounts/{accountBalances.factory.js => accountBalances.factory.ts} (100%) rename src/accounts/{index.js => index.ts} (85%) rename src/{app.config.js => app.config.ts} (100%) rename src/{app.js => app.ts} (77%) rename src/{bootstrap.config.js => bootstrap.config.ts} (100%) rename src/login/{index.js => index.ts} (100%) rename src/login/{login.config.js => login.config.ts} (100%) rename src/login/{login.service.js => login.service.ts} (100%) rename src/operations/{balance-chart.component.js => balance-chart.component.ts} (100%) rename src/operations/{category-chart.component.js => category-chart.component.ts} (100%) rename src/operations/{index.js => index.ts} (86%) rename src/operations/{operation.config.js => operation.config.ts} (100%) rename src/operations/{operation.controller.js => operation.controller.ts} (100%) rename src/operations/{operation.factory.js => operation.factory.ts} (100%) rename src/scheduler/{index.js => index.ts} (87%) rename src/scheduler/{schedule.config.js => schedule.config.ts} (100%) rename src/scheduler/{schedule.controller.js => schedule.controller.ts} (100%) rename src/scheduler/{schedule.factory.js => schedule.factory.ts} (100%) diff --git a/src/accounts/account.config.js b/src/accounts/account.config.ts similarity index 100% rename from src/accounts/account.config.js rename to src/accounts/account.config.ts diff --git a/src/accounts/account.controller.js b/src/accounts/account.controller.ts similarity index 100% rename from src/accounts/account.controller.js rename to src/accounts/account.controller.ts diff --git a/src/accounts/account.factory.js b/src/accounts/account.factory.ts similarity index 100% rename from src/accounts/account.factory.js rename to src/accounts/account.factory.ts diff --git a/src/accounts/accountBalances.factory.js b/src/accounts/accountBalances.factory.ts similarity index 100% rename from src/accounts/accountBalances.factory.js rename to src/accounts/accountBalances.factory.ts diff --git a/src/accounts/index.js b/src/accounts/index.ts similarity index 85% rename from src/accounts/index.js rename to src/accounts/index.ts index 75e3bc0..bab9a69 100644 --- a/src/accounts/index.js +++ b/src/accounts/index.ts @@ -25,10 +25,10 @@ var ngResource = require('angular-resource'), ngUiNotification = require('angular-ui-notification'), ngStrap = require('angular-strap'); -var AccountFactory = require('./account.factory.js'); -var AccountBalancesFactory = require('./accountBalances.factory.js'); -var AccountConfig = require('./account.config.js'); -var AccountController = require('./account.controller.js'); +var AccountFactory = require('./account.factory'); +var AccountBalancesFactory = require('./accountBalances.factory'); +var AccountConfig = require('./account.config'); +var AccountController = require('./account.controller'); module.exports = angular.module('accountant.accounts', [ ngResource, diff --git a/src/app.config.js b/src/app.config.ts similarity index 100% rename from src/app.config.js rename to src/app.config.ts diff --git a/src/app.js b/src/app.ts similarity index 77% rename from src/app.js rename to src/app.ts index b4b2d47..241ff89 100644 --- a/src/app.js +++ b/src/app.ts @@ -22,14 +22,14 @@ var angular = require('angular'); var ngRoute = require('angular-route'); -var accountModule = require('./accounts'), - loginModule = require('./login'), - operationModule = require('./operations'), - schedulerModule = require('./scheduler'); +import accountModule from '@accountant/accounts'; +import loginModule from '@accountant/login'; +import operationModule from '@accountant/operations'; +import schedulerModule from '@accountant/scheduler'; -var routing = require('./app.config'); +var routing = require('./app.config.ts'); -require('bootstrap-webpack!./bootstrap.config.js'); +require('bootstrap-webpack!./bootstrap.config.ts'); angular.module('accountant', [ ngRoute, diff --git a/src/bootstrap.config.js b/src/bootstrap.config.ts similarity index 100% rename from src/bootstrap.config.js rename to src/bootstrap.config.ts diff --git a/src/login/index.js b/src/login/index.ts similarity index 100% rename from src/login/index.js rename to src/login/index.ts diff --git a/src/login/login.config.js b/src/login/login.config.ts similarity index 100% rename from src/login/login.config.js rename to src/login/login.config.ts diff --git a/src/login/login.service.js b/src/login/login.service.ts similarity index 100% rename from src/login/login.service.js rename to src/login/login.service.ts diff --git a/src/operations/balance-chart.component.js b/src/operations/balance-chart.component.ts similarity index 100% rename from src/operations/balance-chart.component.js rename to src/operations/balance-chart.component.ts diff --git a/src/operations/category-chart.component.js b/src/operations/category-chart.component.ts similarity index 100% rename from src/operations/category-chart.component.js rename to src/operations/category-chart.component.ts diff --git a/src/operations/index.js b/src/operations/index.ts similarity index 86% rename from src/operations/index.js rename to src/operations/index.ts index 1b97b02..462930c 100644 --- a/src/operations/index.js +++ b/src/operations/index.ts @@ -27,15 +27,16 @@ var ngResource = require('angular-resource'), ngUiNotification = require('angular-ui-notification'), ngStrap = require('angular-strap'); -var balanceChartModule = require('./balance-chart.component.js'), - categoryChartModule = require('./category-chart.component.js'), - accountModule = require('../accounts'); +var balanceChartModule = require('./balance-chart.component'), + categoryChartModule = require('./category-chart.component'); + +import accountModule from '../accounts/index'; var OperationFactory = require('./operation.factory'); var OperationConfig = require('./operation.config'); var OperationController = require('./operation.controller'); -module.exports = angular.module('accountant.operations', [ +export default angular.module('accountant.operations', [ ngResource, ngMessages, ngUiNotification, diff --git a/src/operations/operation.config.js b/src/operations/operation.config.ts similarity index 100% rename from src/operations/operation.config.js rename to src/operations/operation.config.ts diff --git a/src/operations/operation.controller.js b/src/operations/operation.controller.ts similarity index 100% rename from src/operations/operation.controller.js rename to src/operations/operation.controller.ts diff --git a/src/operations/operation.factory.js b/src/operations/operation.factory.ts similarity index 100% rename from src/operations/operation.factory.js rename to src/operations/operation.factory.ts diff --git a/src/scheduler/index.js b/src/scheduler/index.ts similarity index 87% rename from src/scheduler/index.js rename to src/scheduler/index.ts index e0cc799..721c2ea 100644 --- a/src/scheduler/index.js +++ b/src/scheduler/index.ts @@ -24,9 +24,9 @@ var ngMessages = require('angular-messages'), ngUiNotification = require('angular-ui-notification'), ngStrap = require('angular-strap'); -var ScheduleConfig = require('./schedule.config.js'); -var ScheduleController = require('./schedule.controller.js'); -var ScheduleFactory = require('./schedule.factory.js'); +var ScheduleConfig = require('./schedule.config'); +var ScheduleController = require('./schedule.controller'); +var ScheduleFactory = require('./schedule.factory'); module.exports = angular.module('accountant.scheduler', [ ngMessages, diff --git a/src/scheduler/schedule.config.js b/src/scheduler/schedule.config.ts similarity index 100% rename from src/scheduler/schedule.config.js rename to src/scheduler/schedule.config.ts diff --git a/src/scheduler/schedule.controller.js b/src/scheduler/schedule.controller.ts similarity index 100% rename from src/scheduler/schedule.controller.js rename to src/scheduler/schedule.controller.ts diff --git a/src/scheduler/schedule.factory.js b/src/scheduler/schedule.factory.ts similarity index 100% rename from src/scheduler/schedule.factory.js rename to src/scheduler/schedule.factory.ts diff --git a/webpack.config.js b/webpack.config.js index 6323694..5b2e547 100644 --- a/webpack.config.js +++ b/webpack.config.js @@ -5,8 +5,17 @@ const webpack = require('webpack'); module.exports = { context: path.resolve(__dirname, 'src'), - entry: './app.js', + entry: './app.ts', devtool: 'source-map', + resolve: { + extensions: ['.js', '.jsx', '.ts', '.tsx', '.html'], + alias: { + '@accountant/accounts': './accounts/index.ts', + '@accountant/operations': './operations/index.ts', + '@accountant/login': './login/index.ts', + '@accountant/scheduler': './scheduler/index.ts' + } + }, module: { rules: [{ enforce: 'pre',