-
-
Notifications
You must be signed in to change notification settings - Fork 641
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #1306 from joshhunt/webpack
WIP: Initial Webpack work
- Loading branch information
Showing
60 changed files
with
479 additions
and
530 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,5 +1,13 @@ | ||
| { | ||
| "presets": [ | ||
| "es2015" | ||
| ["env", { | ||
| "targets": { | ||
| "browsers": [ | ||
| "last 2 versions" | ||
| ] | ||
| }, | ||
| "modules": false, | ||
| "loose": true | ||
| }] | ||
| ] | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -24,3 +24,4 @@ build/dim-extension.zip | |
| .brackets.json | ||
| .npmrc | ||
| npm-debug.log | ||
| app/generated | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,33 +1,86 @@ | ||
| window._ = require('underscore'); | ||
| require('babel-polyfill'); | ||
|
|
||
| require('./scripts/google'); | ||
|
|
||
| // TODO: remove this globals and instead require where needed | ||
| window._ = require('underscore'); | ||
| window.$ = window.jQuery = require('jquery'); | ||
| require('jquery-textcomplete'); | ||
| require('jquery-ui/ui/position'); | ||
|
|
||
| window.humanizeDuration = require('humanize-duration'); | ||
| require('imports?define=>false,module=>false,self=>window!idb-keyval'); | ||
| // window.JSZip = require('jszip'); | ||
| require('imports-loader?define=>false,module=>false,self=>window!idb-keyval'); | ||
| window.JSZip = require('jszip'); | ||
| window.LZString = require('lz-string'); | ||
| window.MessageFormat = require('messageformat'); | ||
| window.moment = require('moment'); | ||
| window.SQL = require('sql.js'); | ||
| require('imports?this=>window!zip-js/WebContent/zip.js'); | ||
| require('imports-loader?this=>window!zip-js/WebContent/zip.js'); | ||
| window.angular = require('angular'); | ||
|
|
||
| require('./scripts/util'); // TODO: make these not global and instead import where needed | ||
|
|
||
| require('./scripts/dimApp.module'); | ||
| require('./scripts/dimApp.config'); | ||
| require('./scripts/dimApp.i18n'); | ||
|
|
||
| require('./scripts/services/dimActionQueue.factory'); | ||
| require('./scripts/services/dimBungieService.factory'); | ||
| require('./scripts/services/dimDefinitions.factory'); | ||
| require('./scripts/services/dimManifestService.factory'); | ||
| require('./scripts/services/dimBucketService.factory'); | ||
| require('./scripts/services/dimInfoService.factory'); | ||
| require('./scripts/services/dimPlatformService.factory'); | ||
| require('./scripts/services/dimLoadoutService.factory'); | ||
| require('./scripts/services/dimSettingsService.factory'); | ||
| require('./scripts/services/dimStoreService.factory'); | ||
| require('./scripts/services/dimVendorService.factory'); | ||
| require('./scripts/services/dimXurService.factory'); | ||
| require('./scripts/services/dimCsvService.factory'); | ||
| require('./scripts/services/dimItemService.factory'); | ||
| require('./scripts/services/dimItemMoveService.factory'); | ||
| require('./scripts/services/dimItemInfoService.factory'); | ||
| require('./scripts/services/dimFarmingService.factory'); | ||
| require('./scripts/services/dimSyncService.factory'); | ||
|
|
||
| window.angular = require('exports?window.angular!angular'); | ||
| require('./scripts/loadout/dimLoadout.directive'); | ||
| require('./scripts/loadout/dimLoadoutPopup.directive'); | ||
| require('./scripts/loadout/random/dimRandom.controller'); | ||
| require('./scripts/compare/dimCompare.directive'); | ||
| require('./scripts/compare/dimCompareService.factory'); | ||
| require('./scripts/shell/dimAngularFilters.filter'); | ||
| require('./scripts/shell/dimMaterialsExchangeCtrl.controller'); | ||
| require('./scripts/shell/dimAppCtrl.controller'); | ||
| require('./scripts/shell/dimSettingsCtrl.controller'); | ||
| require('./scripts/shell/dimPlatformChoice.directive'); | ||
| require('./scripts/shell/dimSearchFilter.directive'); | ||
| require('./scripts/shell/dimClickAnywhereButHere.directive'); | ||
| require('./scripts/shell/dimFilterLink.directive'); | ||
| require('./scripts/shell/dimManifestProgress.directive'); | ||
| require('./scripts/store/dimPercentWidth.directive'); | ||
| require('./scripts/store/dimStores.directive'); | ||
| require('./scripts/store/dimStoreBucket.directive'); | ||
| require('./scripts/store/dimStoreReputation.directive'); | ||
| require('./scripts/store/dimStoreItem.directive'); | ||
| require('./scripts/store/dimStoreHeading.directive'); | ||
| require('./scripts/store/dimSimpleItem.directive'); | ||
| require('./scripts/store/dimStats.directive'); | ||
| require('./scripts/store/dimFarming.directive'); | ||
| require('./scripts/store/dimClearNewItems.directive'); | ||
| require('./scripts/move-popup/dimMoveAmount.directive'); | ||
| require('./scripts/move-popup/dimMovePopup.directive'); | ||
| require('./scripts/move-popup/dimTalentGrid.directive'); | ||
| require('./scripts/move-popup/dimMoveItemProperties.directive'); | ||
| require('./scripts/move-popup/dimItemTag.directive'); | ||
| require('./scripts/infuse/dimInfuse.controller'); | ||
| require('./scripts/xur/dimXur.controller'); | ||
| require('./scripts/vendors/dimVendor.controller'); | ||
| require('./scripts/vendors/dimVendorItems.directive'); | ||
| require('./scripts/vendors/dimVendorCurrencies.directive'); | ||
| require('./scripts/minmax/dimMinMax.controller'); | ||
| require('./scripts/minmax/dimMinMaxItem.directive'); | ||
| require('./scripts/minmax/dimMinMaxLocks.directive'); | ||
| require('./scripts/minmax/dimMinMaxCharSelect.directive'); | ||
| require('./scripts/debug/dimDebugItem.controller'); | ||
| require('./scripts/developer/dimDeveloper.controller'); | ||
| require('./scripts/materials-exchange/dimCollapsible.directive'); | ||
|
|
||
| require('angular-aria'); | ||
| require('angular-chrome-storage/angular-chrome-storage'); | ||
| require('angular-hotkeys'); | ||
| require('angular-messages'); | ||
| require('angular-moment'); | ||
| require('angular-native-dragdrop'); | ||
| require('angular-promise-tracker'); | ||
| require('angular-timer'); | ||
| require('angular-translate'); | ||
| require('angular-translate-interpolation-messageformat'); | ||
| require('angular-ui-router'); | ||
| require('angular-uuid2/dist/angular-uuid2.js'); | ||
| require('angularjs-slider'); | ||
| require('angularjs-toaster'); | ||
| require('ng-dialog'); | ||
| require('ng-http-rate-limiter'); | ||
| require('./scss/main.scss'); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,3 +1,6 @@ | ||
| const angular = require('angular'); | ||
| const _ = require('underscore'); | ||
|
|
||
| (function() { | ||
| 'use strict'; | ||
|
|
||
|
|
||
File renamed without changes.
Oops, something went wrong.