references/openproject
1
0
Fork 0
mirror of https://github.com/opf/openproject.git synced 2026-06-14 03:30:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

Migrate to webpack 2

Browse Source
This commit is contained in:
Oliver Günther
2017-01-29 23:43:13 +01:00
parent 0fa771f851
commit 039ba1dd2f
9 changed files with 505 additions and 178 deletions
Download Patch File Download Diff File Expand all files Collapse all files
frontend/app/components/wp-display/wp-display-field/wp-display-field.config.ts
+1 -1
View File
@@ -33,7 +33,7 @@ import {StringObjectDisplayField} from '../field-types/wp-display-string-object-
import {FormattableDisplayField} from '../field-types/wp-display-formattable-field.module';
import {DurationDisplayField} from '../field-types/wp-display-duration-field.module';
import {DateDisplayField} from '../field-types/wp-display-date-field.module';
import {DateTimeDisplayField} from '../field-types/wp-display-datetime-field.module.ts';
import {DateTimeDisplayField} from '../field-types/wp-display-datetime-field.module';
import {IdDisplayField} from '../field-types/wp-display-id-field.module';
import {BooleanDisplayField} from '../field-types/wp-display-boolean-field.module';
import {ProgressDisplayField} from '../field-types/wp-display-progress-field.module';
frontend/app/global.js
+8 -5
View File
@@ -34,10 +34,16 @@
// See: https://github.com/webpack/style-loader/issues/31
require('phantomjs-polyfill');
require('jquery');
// Globally exposed dependencies
require('expose-loader?jQuery!jquery');
require('expose-loader?angular!angular');
require('expose-loader?dragula!dragula');
require('expose-loader?moment!moment');
require('expose-loader?mousetrap!mousetrap');
require('expose-loader?URI!URIjs');
require('jquery-ujs');
require('dragula');
require('angular-dragula');
require('jquery-ui/ui/core.js');
@@ -56,7 +62,6 @@ require('jquery-ui/themes/base/datepicker.css');
require('jquery-ui/ui/widgets/dialog.js');
require('jquery-ui/themes/base/dialog.css');
require('expose?moment!moment');
require('moment/locale/en-gb.js');
require('moment/locale/de.js');
@@ -69,7 +74,6 @@ require('moment-timezone/builds/moment-timezone-with-data.min.js');
require('select2/select2.min.js');
require('select2/select2.css');
require('angular');
require('angular-sanitize');
require('ui-select/dist/select.min.js');
@@ -78,5 +82,4 @@ require('ui-select/dist/select.min.css');
require('ng-dialog/js/ngDialog.min.js');
require('ng-dialog/css/ngDialog.min.css');
require('expose?URI!URIjs');
require('URIjs/src/URITemplate');
frontend/app/init-app.js
+1 -2
View File
@@ -44,7 +44,6 @@ require('angular-busy/dist/angular-busy.css');
require('angular-context-menu');
require('angular-elastic');
require('angular-cache');
require('mousetrap');
require('ngFileUpload');
var opApp = require('./angular-modules.ts').default;
@@ -156,7 +155,7 @@ require('./work_packages');
var requireTemplate = require.context('./templates', true, /\.html$/);
requireTemplate.keys().forEach(requireTemplate);
require('!ngtemplate?module=openproject.templates!html!angular-busy/angular-busy.html');
require('!ngtemplate-loader?module=openproject.templates!html-loader!angular-busy/angular-busy.html');
var requireComponent = require.context('./components/', true, /^((?!\.(test|spec)).)*\.(js|ts|html)$/);
requireComponent.keys().forEach(requireComponent);
frontend/npm-shrinkwrap.json
Generated
+431 -103
View File
@@ -7,6 +7,28 @@
"from": "acorn@>=2.6.4 <2.7.0",
"resolved": "https://registry.npmjs.org/acorn/-/acorn-2.6.4.tgz"
},
"acorn-dynamic-import": {
"version": "2.0.1",
"from": "acorn-dynamic-import@>=2.0.0 <3.0.0",
"resolved": "https://registry.npmjs.org/acorn-dynamic-import/-/acorn-dynamic-import-2.0.1.tgz",
"dependencies": {
"acorn": {
"version": "4.0.4",
"from": "acorn@>=4.0.3 <5.0.0",
"resolved": "https://registry.npmjs.org/acorn/-/acorn-4.0.4.tgz"
}
}
},
"ajv": {
"version": "4.11.2",
"from": "ajv@>=4.7.0 <5.0.0",
"resolved": "https://registry.npmjs.org/ajv/-/ajv-4.11.2.tgz"
},
"ajv-keywords": {
"version": "1.5.1",
"from": "ajv-keywords@>=1.1.1 <2.0.0",
"resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-1.5.1.tgz"
},
"align-text": {
"version": "0.1.4",
"from": "align-text@>=0.1.3 <0.2.0",
@@ -132,6 +154,11 @@
"from": "arrify@>=1.0.0 <2.0.0",
"resolved": "https://registry.npmjs.org/arrify/-/arrify-1.0.1.tgz"
},
"asn1.js": {
"version": "4.9.1",
"from": "asn1.js@>=4.0.0 <5.0.0",
"resolved": "https://registry.npmjs.org/asn1.js/-/asn1.js-4.9.1.tgz"
},
"assert": {
"version": "1.4.1",
"from": "assert@>=1.1.1 <2.0.0",
@@ -189,6 +216,11 @@
"from": "binary-extensions@>=1.0.0 <2.0.0",
"resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-1.8.0.tgz"
},
"bn.js": {
"version": "4.11.6",
"from": "bn.js@>=4.1.1 <5.0.0",
"resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.11.6.tgz"
},
"bourbon": {
"version": "4.2.7",
"from": "bourbon@>=4.2.1 <4.3.0",
@@ -204,10 +236,35 @@
"from": "braces@>=1.8.2 <2.0.0",
"resolved": "https://registry.npmjs.org/braces/-/braces-1.8.5.tgz"
},
"brorand": {
"version": "1.0.6",
"from": "brorand@>=1.0.1 <2.0.0",
"resolved": "https://registry.npmjs.org/brorand/-/brorand-1.0.6.tgz"
},
"browserify-aes": {
"version": "0.4.0",
"from": "browserify-aes@0.4.0",
"resolved": "https://registry.npmjs.org/browserify-aes/-/browserify-aes-0.4.0.tgz"
"version": "1.0.6",
"from": "browserify-aes@>=1.0.4 <2.0.0",
"resolved": "https://registry.npmjs.org/browserify-aes/-/browserify-aes-1.0.6.tgz"
},
"browserify-cipher": {
"version": "1.0.0",
"from": "browserify-cipher@>=1.0.0 <2.0.0",
"resolved": "https://registry.npmjs.org/browserify-cipher/-/browserify-cipher-1.0.0.tgz"
},
"browserify-des": {
"version": "1.0.0",
"from": "browserify-des@>=1.0.0 <2.0.0",
"resolved": "https://registry.npmjs.org/browserify-des/-/browserify-des-1.0.0.tgz"
},
"browserify-rsa": {
"version": "4.0.1",
"from": "browserify-rsa@>=4.0.0 <5.0.0",
"resolved": "https://registry.npmjs.org/browserify-rsa/-/browserify-rsa-4.0.1.tgz"
},
"browserify-sign": {
"version": "4.0.0",
"from": "browserify-sign@>=4.0.0 <5.0.0",
"resolved": "https://registry.npmjs.org/browserify-sign/-/browserify-sign-4.0.0.tgz"
},
"browserify-zlib": {
"version": "0.1.4",
@@ -229,6 +286,16 @@
"from": "buffer-shims@>=1.0.0 <2.0.0",
"resolved": "https://registry.npmjs.org/buffer-shims/-/buffer-shims-1.0.0.tgz"
},
"buffer-xor": {
"version": "1.0.3",
"from": "buffer-xor@>=1.0.2 <2.0.0",
"resolved": "https://registry.npmjs.org/buffer-xor/-/buffer-xor-1.0.3.tgz"
},
"builtin-modules": {
"version": "1.1.1",
"from": "builtin-modules@>=1.0.0 <2.0.0",
"resolved": "https://registry.npmjs.org/builtin-modules/-/builtin-modules-1.1.1.tgz"
},
"builtin-status-codes": {
"version": "3.0.0",
"from": "builtin-status-codes@>=3.0.0 <4.0.0",
@@ -271,6 +338,11 @@
"from": "chokidar@>=1.0.0 <2.0.0",
"resolved": "https://registry.npmjs.org/chokidar/-/chokidar-1.6.1.tgz"
},
"cipher-base": {
"version": "1.0.3",
"from": "cipher-base@>=1.0.0 <2.0.0",
"resolved": "https://registry.npmjs.org/cipher-base/-/cipher-base-1.0.3.tgz"
},
"cliui": {
"version": "2.1.0",
"from": "cliui@>=2.1.0 <3.0.0",
@@ -283,10 +355,15 @@
}
}
},
"clone": {
"version": "1.0.2",
"from": "clone@>=1.0.2 <2.0.0",
"resolved": "https://registry.npmjs.org/clone/-/clone-1.0.2.tgz"
"co": {
"version": "4.6.0",
"from": "co@>=4.6.0 <5.0.0",
"resolved": "https://registry.npmjs.org/co/-/co-4.6.0.tgz"
},
"code-point-at": {
"version": "1.1.0",
"from": "code-point-at@>=1.0.0 <2.0.0",
"resolved": "https://registry.npmjs.org/code-point-at/-/code-point-at-1.1.0.tgz"
},
"colors": {
"version": "1.1.2",
@@ -335,15 +412,30 @@
}
}
},
"create-ecdh": {
"version": "4.0.0",
"from": "create-ecdh@>=4.0.0 <5.0.0",
"resolved": "https://registry.npmjs.org/create-ecdh/-/create-ecdh-4.0.0.tgz"
},
"create-hash": {
"version": "1.1.2",
"from": "create-hash@>=1.1.0 <2.0.0",
"resolved": "https://registry.npmjs.org/create-hash/-/create-hash-1.1.2.tgz"
},
"create-hmac": {
"version": "1.1.4",
"from": "create-hmac@>=1.1.0 <2.0.0",
"resolved": "https://registry.npmjs.org/create-hmac/-/create-hmac-1.1.4.tgz"
},
"crossvent": {
"version": "1.5.5",
"from": "crossvent@>=1.5.4 <2.0.0",
"resolved": "https://registry.npmjs.org/crossvent/-/crossvent-1.5.5.tgz"
},
"crypto-browserify": {
"version": "3.3.0",
"from": "crypto-browserify@3.3.0",
"resolved": "https://registry.npmjs.org/crypto-browserify/-/crypto-browserify-3.3.0.tgz"
"version": "3.11.0",
"from": "crypto-browserify@>=3.11.0 <4.0.0",
"resolved": "https://registry.npmjs.org/crypto-browserify/-/crypto-browserify-3.11.0.tgz"
},
"css-loader": {
"version": "0.9.1",
@@ -382,6 +474,16 @@
"from": "decamelize@>=1.0.0 <2.0.0",
"resolved": "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz"
},
"des.js": {
"version": "1.0.0",
"from": "des.js@>=1.0.0 <2.0.0",
"resolved": "https://registry.npmjs.org/des.js/-/des.js-1.0.0.tgz"
},
"diffie-hellman": {
"version": "5.0.2",
"from": "diffie-hellman@>=5.0.0 <6.0.0",
"resolved": "https://registry.npmjs.org/diffie-hellman/-/diffie-hellman-5.0.2.tgz"
},
"domain-browser": {
"version": "1.1.7",
"from": "domain-browser@>=1.1.1 <2.0.0",
@@ -409,6 +511,11 @@
"from": "electron-to-chromium@>=1.2.0 <2.0.0",
"resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.2.1.tgz"
},
"elliptic": {
"version": "6.3.2",
"from": "elliptic@>=6.0.0 <7.0.0",
"resolved": "https://registry.npmjs.org/elliptic/-/elliptic-6.3.2.tgz"
},
"emojis-list": {
"version": "2.1.0",
"from": "emojis-list@>=2.0.0 <3.0.0",
@@ -481,6 +588,11 @@
"from": "events@>=1.0.0 <2.0.0",
"resolved": "https://registry.npmjs.org/events/-/events-1.1.1.tgz"
},
"evp_bytestokey": {
"version": "1.0.0",
"from": "evp_bytestokey@>=1.0.0 <2.0.0",
"resolved": "https://registry.npmjs.org/evp_bytestokey/-/evp_bytestokey-1.0.0.tgz"
},
"expand-brackets": {
"version": "0.1.5",
"from": "expand-brackets@>=0.1.4 <0.2.0",
@@ -514,14 +626,19 @@
"resolved": "https://registry.npmjs.org/extglob/-/extglob-0.3.2.tgz"
},
"extract-text-webpack-plugin": {
"version": "0.3.8",
"from": "extract-text-webpack-plugin@>=0.3.8 <0.4.0",
"resolved": "https://registry.npmjs.org/extract-text-webpack-plugin/-/extract-text-webpack-plugin-0.3.8.tgz",
"version": "2.0.0-rc.2",
"from": "extract-text-webpack-plugin@beta",
"resolved": "https://registry.npmjs.org/extract-text-webpack-plugin/-/extract-text-webpack-plugin-2.0.0-rc.2.tgz",
"dependencies": {
"source-map": {
"version": "0.1.43",
"from": "source-map@>=0.1.38 <0.2.0",
"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.1.43.tgz"
"async": {
"version": "2.1.4",
"from": "async@>=2.1.2 <3.0.0",
"resolved": "https://registry.npmjs.org/async/-/async-2.1.4.tgz"
},
"lodash": {
"version": "4.17.4",
"from": "lodash@>=4.14.0 <5.0.0",
"resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.4.tgz"
}
}
},
@@ -545,6 +662,11 @@
"from": "fill-range@>=2.1.0 <3.0.0",
"resolved": "https://registry.npmjs.org/fill-range/-/fill-range-2.2.3.tgz"
},
"find-up": {
"version": "1.1.2",
"from": "find-up@>=1.0.0 <2.0.0",
"resolved": "https://registry.npmjs.org/find-up/-/find-up-1.1.2.tgz"
},
"for-in": {
"version": "0.1.6",
"from": "for-in@>=0.1.5 <0.2.0",
@@ -1262,6 +1384,11 @@
}
}
},
"get-caller-file": {
"version": "1.0.2",
"from": "get-caller-file@>=1.0.1 <2.0.0",
"resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-1.0.2.tgz"
},
"glob": {
"version": "4.5.3",
"from": "glob@>=4.5.3 <5.0.0",
@@ -1292,6 +1419,16 @@
"from": "has-flag@>=1.0.0 <2.0.0",
"resolved": "https://registry.npmjs.org/has-flag/-/has-flag-1.0.0.tgz"
},
"hash.js": {
"version": "1.0.3",
"from": "hash.js@>=1.0.0 <2.0.0",
"resolved": "https://registry.npmjs.org/hash.js/-/hash.js-1.0.3.tgz"
},
"hosted-git-info": {
"version": "2.1.5",
"from": "hosted-git-info@>=2.1.4 <3.0.0",
"resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.1.5.tgz"
},
"html-loader": {
"version": "0.2.3",
"from": "html-loader@>=0.2.3 <0.3.0",
@@ -1335,9 +1472,14 @@
"resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz"
},
"interpret": {
"version": "0.6.6",
"from": "interpret@>=0.6.4 <0.7.0",
"resolved": "https://registry.npmjs.org/interpret/-/interpret-0.6.6.tgz"
"version": "1.0.1",
"from": "interpret@>=1.0.0 <2.0.0",
"resolved": "https://registry.npmjs.org/interpret/-/interpret-1.0.1.tgz"
},
"invert-kv": {
"version": "1.0.0",
"from": "invert-kv@>=1.0.0 <2.0.0",
"resolved": "https://registry.npmjs.org/invert-kv/-/invert-kv-1.0.0.tgz"
},
"is-arrayish": {
"version": "0.2.1",
@@ -1354,6 +1496,11 @@
"from": "is-buffer@>=1.0.2 <2.0.0",
"resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.4.tgz"
},
"is-builtin-module": {
"version": "1.0.0",
"from": "is-builtin-module@>=1.0.0 <2.0.0",
"resolved": "https://registry.npmjs.org/is-builtin-module/-/is-builtin-module-1.0.0.tgz"
},
"is-dotfile": {
"version": "1.0.2",
"from": "is-dotfile@>=1.0.0 <2.0.0",
@@ -1374,6 +1521,11 @@
"from": "is-extglob@>=1.0.0 <2.0.0",
"resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-1.0.0.tgz"
},
"is-fullwidth-code-point": {
"version": "1.0.0",
"from": "is-fullwidth-code-point@>=1.0.0 <2.0.0",
"resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz"
},
"is-glob": {
"version": "2.0.1",
"from": "is-glob@>=2.0.0 <3.0.0",
@@ -1394,6 +1546,11 @@
"from": "is-primitive@>=2.0.0 <3.0.0",
"resolved": "https://registry.npmjs.org/is-primitive/-/is-primitive-2.0.0.tgz"
},
"is-utf8": {
"version": "0.2.1",
"from": "is-utf8@>=0.2.0 <0.3.0",
"resolved": "https://registry.npmjs.org/is-utf8/-/is-utf8-0.2.1.tgz"
},
"isarray": {
"version": "1.0.0",
"from": "isarray@>=1.0.0 <1.1.0",
@@ -1434,11 +1591,26 @@
"from": "js-yaml@>=3.4.3 <4.0.0",
"resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.7.0.tgz"
},
"json-loader": {
"version": "0.5.4",
"from": "json-loader@>=0.5.4 <0.6.0",
"resolved": "https://registry.npmjs.org/json-loader/-/json-loader-0.5.4.tgz"
},
"json-stable-stringify": {
"version": "1.0.1",
"from": "json-stable-stringify@>=1.0.1 <2.0.0",
"resolved": "https://registry.npmjs.org/json-stable-stringify/-/json-stable-stringify-1.0.1.tgz"
},
"json5": {
"version": "0.5.1",
"from": "json5@>=0.5.0 <0.6.0",
"resolved": "https://registry.npmjs.org/json5/-/json5-0.5.1.tgz"
},
"jsonify": {
"version": "0.0.0",
"from": "jsonify@>=0.0.0 <0.1.0",
"resolved": "https://registry.npmjs.org/jsonify/-/jsonify-0.0.0.tgz"
},
"kind-of": {
"version": "3.1.0",
"from": "kind-of@>=3.0.2 <4.0.0",
@@ -1449,6 +1621,21 @@
"from": "lazy-cache@>=1.0.3 <2.0.0",
"resolved": "https://registry.npmjs.org/lazy-cache/-/lazy-cache-1.0.4.tgz"
},
"lcid": {
"version": "1.0.0",
"from": "lcid@>=1.0.0 <2.0.0",
"resolved": "https://registry.npmjs.org/lcid/-/lcid-1.0.0.tgz"
},
"load-json-file": {
"version": "1.1.0",
"from": "load-json-file@>=1.0.0 <2.0.0",
"resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-1.1.0.tgz"
},
"loader-runner": {
"version": "2.3.0",
"from": "loader-runner@>=2.2.0 <3.0.0",
"resolved": "https://registry.npmjs.org/loader-runner/-/loader-runner-2.3.0.tgz"
},
"loader-utils": {
"version": "0.2.16",
"from": "loader-utils@>=0.2.6 <0.3.0",
@@ -1484,11 +1671,21 @@
"from": "micromatch@>=2.1.5 <3.0.0",
"resolved": "https://registry.npmjs.org/micromatch/-/micromatch-2.3.11.tgz"
},
"miller-rabin": {
"version": "4.0.0",
"from": "miller-rabin@>=4.0.0 <5.0.0",
"resolved": "https://registry.npmjs.org/miller-rabin/-/miller-rabin-4.0.0.tgz"
},
"mime": {
"version": "1.2.11",
"from": "mime@>=1.2.0 <1.3.0",
"resolved": "https://registry.npmjs.org/mime/-/mime-1.2.11.tgz"
},
"minimalistic-assert": {
"version": "1.0.0",
"from": "minimalistic-assert@>=1.0.0 <2.0.0",
"resolved": "https://registry.npmjs.org/minimalistic-assert/-/minimalistic-assert-1.0.0.tgz"
},
"minimatch": {
"version": "2.0.10",
"from": "minimatch@>=2.0.1 <3.0.0",
@@ -1543,16 +1740,9 @@
"resolved": "https://registry.npmjs.org/ng-annotate/-/ng-annotate-1.2.1.tgz"
},
"ng-annotate-loader": {
"version": "0.0.10",
"from": "ng-annotate-loader@0.0.10",
"resolved": "https://registry.npmjs.org/ng-annotate-loader/-/ng-annotate-loader-0.0.10.tgz",
"dependencies": {
"source-map": {
"version": "0.4.2",
"from": "source-map@0.4.2",
"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.4.2.tgz"
}
}
"version": "0.2.0",
"from": "ng-annotate-loader@0.2.0",
"resolved": "https://registry.npmjs.org/ng-annotate-loader/-/ng-annotate-loader-0.2.0.tgz"
},
"ng-dialog": {
"version": "0.6.6",
@@ -1570,9 +1760,14 @@
"resolved": "https://registry.npmjs.org/ngtemplate-loader/-/ngtemplate-loader-0.1.3.tgz"
},
"node-libs-browser": {
"version": "0.7.0",
"from": "node-libs-browser@>=0.7.0 <0.8.0",
"resolved": "https://registry.npmjs.org/node-libs-browser/-/node-libs-browser-0.7.0.tgz"
"version": "2.0.0",
"from": "node-libs-browser@>=2.0.0 <3.0.0",
"resolved": "https://registry.npmjs.org/node-libs-browser/-/node-libs-browser-2.0.0.tgz"
},
"normalize-package-data": {
"version": "2.3.5",
"from": "normalize-package-data@>=2.3.4 <3.0.0",
"resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.3.5.tgz"
},
"normalize-path": {
"version": "2.0.1",
@@ -1589,6 +1784,11 @@
"from": "num2fraction@>=1.2.2 <2.0.0",
"resolved": "https://registry.npmjs.org/num2fraction/-/num2fraction-1.2.2.tgz"
},
"number-is-nan": {
"version": "1.0.1",
"from": "number-is-nan@>=1.0.0 <2.0.0",
"resolved": "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.1.tgz"
},
"object-assign": {
"version": "4.1.1",
"from": "object-assign@>=4.1.0 <5.0.0",
@@ -1639,11 +1839,21 @@
"from": "os-homedir@>=1.0.1 <2.0.0",
"resolved": "https://registry.npmjs.org/os-homedir/-/os-homedir-1.0.2.tgz"
},
"os-locale": {
"version": "1.4.0",
"from": "os-locale@>=1.4.0 <2.0.0",
"resolved": "https://registry.npmjs.org/os-locale/-/os-locale-1.4.0.tgz"
},
"pako": {
"version": "0.2.9",
"from": "pako@>=0.2.0 <0.3.0",
"resolved": "https://registry.npmjs.org/pako/-/pako-0.2.9.tgz"
},
"parse-asn1": {
"version": "5.0.0",
"from": "parse-asn1@>=5.0.0 <6.0.0",
"resolved": "https://registry.npmjs.org/parse-asn1/-/parse-asn1-5.0.0.tgz"
},
"parse-glob": {
"version": "3.0.4",
"from": "parse-glob@>=3.0.4 <4.0.0",
@@ -1659,21 +1869,46 @@
"from": "path-browserify@0.0.0",
"resolved": "https://registry.npmjs.org/path-browserify/-/path-browserify-0.0.0.tgz"
},
"path-exists": {
"version": "2.1.0",
"from": "path-exists@>=2.0.0 <3.0.0",
"resolved": "https://registry.npmjs.org/path-exists/-/path-exists-2.1.0.tgz"
},
"path-is-absolute": {
"version": "1.0.1",
"from": "path-is-absolute@>=1.0.0 <2.0.0",
"resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz"
},
"pbkdf2-compat": {
"version": "2.0.1",
"from": "pbkdf2-compat@2.0.1",
"resolved": "https://registry.npmjs.org/pbkdf2-compat/-/pbkdf2-compat-2.0.1.tgz"
"path-type": {
"version": "1.1.0",
"from": "path-type@>=1.0.0 <2.0.0",
"resolved": "https://registry.npmjs.org/path-type/-/path-type-1.1.0.tgz"
},
"pbkdf2": {
"version": "3.0.9",
"from": "pbkdf2@>=3.0.3 <4.0.0",
"resolved": "https://registry.npmjs.org/pbkdf2/-/pbkdf2-3.0.9.tgz"
},
"phantomjs-polyfill": {
"version": "0.0.2",
"from": "phantomjs-polyfill@0.0.2",
"resolved": "https://registry.npmjs.org/phantomjs-polyfill/-/phantomjs-polyfill-0.0.2.tgz"
},
"pify": {
"version": "2.3.0",
"from": "pify@>=2.0.0 <3.0.0",
"resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz"
},
"pinkie": {
"version": "2.0.4",
"from": "pinkie@>=2.0.0 <3.0.0",
"resolved": "https://registry.npmjs.org/pinkie/-/pinkie-2.0.4.tgz"
},
"pinkie-promise": {
"version": "2.0.1",
"from": "pinkie-promise@>=2.0.0 <3.0.0",
"resolved": "https://registry.npmjs.org/pinkie-promise/-/pinkie-promise-2.0.1.tgz"
},
"postcss": {
"version": "5.2.11",
"from": "postcss@>=5.2.11 <6.0.0",
@@ -1696,7 +1931,7 @@
},
"postcss-loader": {
"version": "1.2.2",
"from": "postcss-loader@>=1.1.1 <2.0.0",
"from": "postcss-loader@1.2.2",
"resolved": "https://registry.npmjs.org/postcss-loader/-/postcss-loader-1.2.2.tgz"
},
"postcss-value-parser": {
@@ -1724,6 +1959,11 @@
"from": "prr@>=0.0.0 <0.1.0",
"resolved": "https://registry.npmjs.org/prr/-/prr-0.0.0.tgz"
},
"public-encrypt": {
"version": "4.0.0",
"from": "public-encrypt@>=4.0.0 <5.0.0",
"resolved": "https://registry.npmjs.org/public-encrypt/-/public-encrypt-4.0.0.tgz"
},
"punycode": {
"version": "1.4.1",
"from": "punycode@>=1.2.4 <2.0.0",
@@ -1744,6 +1984,21 @@
"from": "randomatic@>=1.1.3 <2.0.0",
"resolved": "https://registry.npmjs.org/randomatic/-/randomatic-1.1.6.tgz"
},
"randombytes": {
"version": "2.0.3",
"from": "randombytes@>=2.0.0 <3.0.0",
"resolved": "https://registry.npmjs.org/randombytes/-/randombytes-2.0.3.tgz"
},
"read-pkg": {
"version": "1.1.0",
"from": "read-pkg@>=1.0.0 <2.0.0",
"resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-1.1.0.tgz"
},
"read-pkg-up": {
"version": "1.0.1",
"from": "read-pkg-up@>=1.0.1 <2.0.0",
"resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-1.0.1.tgz"
},
"readable-stream": {
"version": "2.2.2",
"from": "readable-stream@>=2.0.1 <3.0.0",
@@ -1776,20 +2031,30 @@
"from": "repeat-string@>=1.5.2 <2.0.0",
"resolved": "https://registry.npmjs.org/repeat-string/-/repeat-string-1.6.1.tgz"
},
"require-directory": {
"version": "2.1.1",
"from": "require-directory@>=2.1.1 <3.0.0",
"resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz"
},
"require-from-string": {
"version": "1.2.1",
"from": "require-from-string@>=1.1.0 <2.0.0",
"resolved": "https://registry.npmjs.org/require-from-string/-/require-from-string-1.2.1.tgz"
},
"require-main-filename": {
"version": "1.0.1",
"from": "require-main-filename@>=1.0.1 <2.0.0",
"resolved": "https://registry.npmjs.org/require-main-filename/-/require-main-filename-1.0.1.tgz"
},
"right-align": {
"version": "0.1.3",
"from": "right-align@>=0.1.1 <0.2.0",
"resolved": "https://registry.npmjs.org/right-align/-/right-align-0.1.3.tgz"
},
"ripemd160": {
"version": "0.2.0",
"from": "ripemd160@0.2.0",
"resolved": "https://registry.npmjs.org/ripemd160/-/ripemd160-0.2.0.tgz"
"version": "1.0.1",
"from": "ripemd160@>=1.0.0 <2.0.0",
"resolved": "https://registry.npmjs.org/ripemd160/-/ripemd160-1.0.1.tgz"
},
"rxjs": {
"version": "5.0.3",
@@ -1801,6 +2066,11 @@
"from": "semver@>=5.0.1 <6.0.0",
"resolved": "https://registry.npmjs.org/semver/-/semver-5.3.0.tgz"
},
"set-blocking": {
"version": "2.0.0",
"from": "set-blocking@>=2.0.0 <3.0.0",
"resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz"
},
"set-immediate-shim": {
"version": "1.0.1",
"from": "set-immediate-shim@>=1.0.1 <2.0.0",
@@ -1812,9 +2082,9 @@
"resolved": "https://registry.npmjs.org/setimmediate/-/setimmediate-1.0.5.tgz"
},
"sha.js": {
"version": "2.2.6",
"from": "sha.js@2.2.6",
"resolved": "https://registry.npmjs.org/sha.js/-/sha.js-2.2.6.tgz"
"version": "2.4.8",
"from": "sha.js@>=2.3.6 <3.0.0",
"resolved": "https://registry.npmjs.org/sha.js/-/sha.js-2.4.8.tgz"
},
"shelljs": {
"version": "0.3.0",
@@ -1846,6 +2116,21 @@
"from": "source-map-support@>=0.4.0 <0.5.0",
"resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.4.11.tgz"
},
"spdx-correct": {
"version": "1.0.2",
"from": "spdx-correct@>=1.0.0 <1.1.0",
"resolved": "https://registry.npmjs.org/spdx-correct/-/spdx-correct-1.0.2.tgz"
},
"spdx-expression-parse": {
"version": "1.0.4",
"from": "spdx-expression-parse@>=1.0.0 <1.1.0",
"resolved": "https://registry.npmjs.org/spdx-expression-parse/-/spdx-expression-parse-1.0.4.tgz"
},
"spdx-license-ids": {
"version": "1.2.2",
"from": "spdx-license-ids@>=1.0.2 <2.0.0",
"resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-1.2.2.tgz"
},
"sprintf-js": {
"version": "1.0.3",
"from": "sprintf-js@>=1.0.2 <1.1.0",
@@ -1871,6 +2156,11 @@
"from": "string_decoder@>=0.10.0 <0.11.0",
"resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz"
},
"string-width": {
"version": "1.0.2",
"from": "string-width@>=1.0.2 <2.0.0",
"resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz"
},
"stringmap": {
"version": "0.2.2",
"from": "stringmap@>=0.2.2 <0.3.0",
@@ -1886,6 +2176,11 @@
"from": "strip-ansi@>=3.0.0 <4.0.0",
"resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz"
},
"strip-bom": {
"version": "2.0.0",
"from": "strip-bom@>=2.0.0 <3.0.0",
"resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-2.0.0.tgz"
},
"style-loader": {
"version": "0.8.3",
"from": "style-loader@>=0.8.2 <0.9.0",
@@ -1932,29 +2227,19 @@
"resolved": "https://registry.npmjs.org/tryor/-/tryor-0.1.2.tgz"
},
"ts-loader": {
"version": "0.7.2",
"from": "ts-loader@>=0.7.2 <0.8.0",
"resolved": "https://registry.npmjs.org/ts-loader/-/ts-loader-0.7.2.tgz",
"version": "2.0.0",
"from": "ts-loader@2.0.0",
"resolved": "https://registry.npmjs.org/ts-loader/-/ts-loader-2.0.0.tgz",
"dependencies": {
"enhanced-resolve": {
"version": "0.9.1",
"from": "enhanced-resolve@>=0.9.0 <0.10.0",
"resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-0.9.1.tgz"
"version": "3.0.3",
"from": "enhanced-resolve@>=3.0.0 <4.0.0",
"resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-3.0.3.tgz"
},
"memory-fs": {
"version": "0.2.0",
"from": "memory-fs@>=0.2.0 <0.3.0",
"resolved": "https://registry.npmjs.org/memory-fs/-/memory-fs-0.2.0.tgz"
},
"object-assign": {
"version": "2.1.1",
"from": "object-assign@>=2.0.0 <3.0.0",
"resolved": "https://registry.npmjs.org/object-assign/-/object-assign-2.1.1.tgz"
},
"tapable": {
"version": "0.1.10",
"from": "tapable@>=0.1.8 <0.2.0",
"resolved": "https://registry.npmjs.org/tapable/-/tapable-0.1.10.tgz"
"version": "0.4.1",
"from": "memory-fs@>=0.4.0 <0.5.0",
"resolved": "https://registry.npmjs.org/memory-fs/-/memory-fs-0.4.1.tgz"
}
}
},
@@ -2022,68 +2307,89 @@
"from": "util-deprecate@>=1.0.1 <1.1.0",
"resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz"
},
"validate-npm-package-license": {
"version": "3.0.1",
"from": "validate-npm-package-license@>=3.0.1 <4.0.0",
"resolved": "https://registry.npmjs.org/validate-npm-package-license/-/validate-npm-package-license-3.0.1.tgz"
},
"vm-browserify": {
"version": "0.0.4",
"from": "vm-browserify@0.0.4",
"resolved": "https://registry.npmjs.org/vm-browserify/-/vm-browserify-0.0.4.tgz"
},
"watchpack": {
"version": "0.2.9",
"from": "watchpack@>=0.2.1 <0.3.0",
"resolved": "https://registry.npmjs.org/watchpack/-/watchpack-0.2.9.tgz",
"version": "1.2.0",
"from": "watchpack@>=1.2.0 <2.0.0",
"resolved": "https://registry.npmjs.org/watchpack/-/watchpack-1.2.0.tgz",
"dependencies": {
"async": {
"version": "0.9.2",
"from": "async@>=0.9.0 <0.10.0",
"resolved": "https://registry.npmjs.org/async/-/async-0.9.2.tgz"
"version": "2.1.4",
"from": "async@^2.1.2",
"resolved": "https://registry.npmjs.org/async/-/async-2.1.4.tgz"
},
"lodash": {
"version": "4.17.4",
"from": "lodash@^4.14.0",
"resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.4.tgz"
}
}
},
"webpack": {
"version": "1.14.0",
"from": "webpack@>=1.13.1 <2.0.0",
"resolved": "https://registry.npmjs.org/webpack/-/webpack-1.14.0.tgz",
"version": "2.2.0",
"from": "webpack@beta",
"resolved": "https://registry.npmjs.org/webpack/-/webpack-2.2.0.tgz",
"dependencies": {
"acorn": {
"version": "3.3.0",
"from": "acorn@>=3.0.0 <4.0.0",
"resolved": "https://registry.npmjs.org/acorn/-/acorn-3.3.0.tgz"
"version": "4.0.4",
"from": "acorn@>=4.0.4 <5.0.0",
"resolved": "https://registry.npmjs.org/acorn/-/acorn-4.0.4.tgz"
},
"async": {
"version": "1.5.2",
"from": "async@>=1.3.0 <2.0.0",
"resolved": "https://registry.npmjs.org/async/-/async-1.5.2.tgz"
"version": "2.1.4",
"from": "async@^2.1.2",
"resolved": "https://registry.npmjs.org/async/-/async-2.1.4.tgz"
},
"camelcase": {
"version": "3.0.0",
"from": "camelcase@>=3.0.0 <4.0.0",
"resolved": "https://registry.npmjs.org/camelcase/-/camelcase-3.0.0.tgz"
},
"cliui": {
"version": "3.2.0",
"from": "cliui@>=3.2.0 <4.0.0",
"resolved": "https://registry.npmjs.org/cliui/-/cliui-3.2.0.tgz"
},
"enhanced-resolve": {
"version": "0.9.1",
"from": "enhanced-resolve@>=0.9.0 <0.10.0",
"resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-0.9.1.tgz",
"dependencies": {
"memory-fs": {
"version": "0.2.0",
"from": "memory-fs@>=0.2.0 <0.3.0",
"resolved": "https://registry.npmjs.org/memory-fs/-/memory-fs-0.2.0.tgz"
}
}
"version": "3.0.3",
"from": "enhanced-resolve@^3.0.0",
"resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-3.0.3.tgz"
},
"tapable": {
"version": "0.1.10",
"from": "tapable@>=0.1.8 <0.2.0",
"resolved": "https://registry.npmjs.org/tapable/-/tapable-0.1.10.tgz"
"lodash": {
"version": "4.17.4",
"from": "lodash@^4.14.0",
"resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.4.tgz"
},
"memory-fs": {
"version": "0.4.1",
"from": "memory-fs@~0.4.1",
"resolved": "https://registry.npmjs.org/memory-fs/-/memory-fs-0.4.1.tgz"
},
"yargs": {
"version": "6.6.0",
"from": "yargs@>=6.0.0 <7.0.0",
"resolved": "https://registry.npmjs.org/yargs/-/yargs-6.6.0.tgz"
}
}
},
"webpack-core": {
"version": "0.6.9",
"from": "webpack-core@>=0.6.9 <0.7.0",
"resolved": "https://registry.npmjs.org/webpack-core/-/webpack-core-0.6.9.tgz",
"dependencies": {
"source-map": {
"version": "0.4.4",
"from": "source-map@>=0.4.1 <0.5.0",
"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.4.4.tgz"
}
}
"webpack-sources": {
"version": "0.1.4",
"from": "webpack-sources@>=0.1.0 <0.2.0",
"resolved": "https://registry.npmjs.org/webpack-sources/-/webpack-sources-0.1.4.tgz"
},
"which-module": {
"version": "1.0.0",
"from": "which-module@>=1.0.0 <2.0.0",
"resolved": "https://registry.npmjs.org/which-module/-/which-module-1.0.0.tgz"
},
"window-size": {
"version": "0.1.0",
@@ -2095,6 +2401,11 @@
"from": "wordwrap@>=0.0.2 <0.1.0",
"resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.3.tgz"
},
"wrap-ansi": {
"version": "2.1.0",
"from": "wrap-ansi@>=2.0.0 <3.0.0",
"resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-2.1.0.tgz"
},
"wrappy": {
"version": "1.0.2",
"from": "wrappy@>=1.0.0 <2.0.0",
@@ -2105,10 +2416,27 @@
"from": "xtend@>=4.0.0 <5.0.0",
"resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.1.tgz"
},
"y18n": {
"version": "3.2.1",
"from": "y18n@>=3.2.1 <4.0.0",
"resolved": "https://registry.npmjs.org/y18n/-/y18n-3.2.1.tgz"
},
"yargs": {
"version": "3.10.0",
"from": "yargs@>=3.10.0 <3.11.0",
"resolved": "https://registry.npmjs.org/yargs/-/yargs-3.10.0.tgz"
},
"yargs-parser": {
"version": "4.2.1",
"from": "yargs-parser@>=4.2.0 <5.0.0",
"resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-4.2.1.tgz",
"dependencies": {
"camelcase": {
"version": "3.0.0",
"from": "camelcase@^3.0.0",
"resolved": "https://registry.npmjs.org/camelcase/-/camelcase-3.0.0.tgz"
}
}
}
}
}
frontend/package.json
+18 -18
View File
@@ -31,23 +31,23 @@
"dependencies": {
"URIjs": "^1.14.1",
"amdefine": "^1.0.0",
"angular-ui-bootstrap": "^2.2.0",
"atoa": "^1.0.0",
"autoprefixer": "^6.5.3",
"awesome-typescript-loader": "^2.2.4",
"angular": "~1.5.9",
"angular-animate": "~1.5.9",
"angular-aria": "~1.5.9",
"angular-busy": "~4.1.1",
"angular-cache": "~4.6.0",
"angular-dragula": "~1.2.8",
"angular-context-menu": "opf/angular-context-menu#a908eccaec323cd66973d58af4965694bdff16a1",
"angular-dragula": "~1.2.8",
"angular-elastic": "2.5.0",
"angular-i18n": "~1.3.0",
"angular-modal": "finnlabs/angular-modal#d45eb9ceb720b8785613ba89ba0f14f8ab197569",
"angular-sanitize": "~1.3.14",
"angular-truncate": "sparkalow/angular-truncate#fdf60fda265042d12e9414b5354b2cc52f1419de",
"angular-ui-bootstrap": "^2.2.0",
"angular-ui-router": "~0.3.1",
"atoa": "^1.0.0",
"autoprefixer": "^6.5.3",
"awesome-typescript-loader": "^2.2.4",
"bourbon": "~4.2.1",
"bundle-loader": "^0.5.4",
"contra": "^1.9.4",
@@ -57,36 +57,36 @@
"dragula": "^3.5.2",
"exports-loader": "^0.6.2",
"expose-loader": "^0.6.0",
"extract-text-webpack-plugin": "^0.3.8",
"extract-text-webpack-plugin": "^2.0.0-rc.2",
"file-loader": "^0.8.1",
"foundation-apps": "1.1.0",
"glob": "^4.5.3",
"html-loader": "^0.2.3",
"lodash": "^2.4.2",
"json5": "^0.5.0",
"jquery": "^3.1.1",
"jquery-ui": "^1.12.1",
"jquery-ujs": "^1.2.2",
"jquery.caret": "^0.3.1",
"json5": "^0.5.0",
"lodash": "^2.4.2",
"moment": "~2.10.6",
"moment-timezone": "0.4.x",
"mousetrap": "~1.4.6",
"ng-annotate-loader": "0.0.10",
"ng-file-upload": "~5.0.9",
"ng-annotate-loader": "^0.2.0",
"ng-dialog": "^0.6.4",
"ng-file-upload": "~5.0.9",
"ngtemplate-loader": "^0.1.2",
"observable-array": "0.0.4",
"phantomjs-polyfill": "0.0.2",
"postcss-loader": "^1.1.1",
"shelljs": "^0.3.0",
"typescript": "2.1.1",
"url-loader": "^0.5.7",
"webpack": "^1.13.1",
"postcss-loader": "^1.2.2",
"rxjs": "^5.0.1",
"ticky": "^1.0.1",
"ts-loader": "^0.7.2",
"shelljs": "^0.3.0",
"style-loader": "^0.8.2",
"ui-select": "~0.19.6"
"ticky": "^1.0.1",
"ts-loader": "^2.0.0",
"typescript": "2.1.1",
"ui-select": "~0.19.6",
"url-loader": "^0.5.7",
"webpack": "^2.2.0"
},
"scripts": {
"pretest": "npm run webpack",
frontend/postcss.config.js
+16
View File
@@ -0,0 +1,16 @@
var fs = require('fs');
var path = require('path');
var _ = require('lodash');
var browsersListConfig = fs.readFileSync(path.join(__dirname, '..', 'browserslist'), 'utf8');
var browsersList = _.filter(browsersListConfig.split('\n'), function (entry) {
return entry && entry.charAt(0) !== '#';
});
module.exports = {
plugins: [
require('autoprefixer')({
browsers: browsersList, cascade: false
})
]
}
frontend/webpack-main-config.js
+29 -45
View File
@@ -61,55 +61,46 @@ fs.readdirSync(translations).forEach(function (file) {
}
});
var browsersListConfig = fs.readFileSync(path.join(__dirname, '..', 'browserslist'), 'utf8');
var browsersList = _.filter(browsersListConfig.split('\n'), function (entry) {
return entry && entry.charAt(0) !== '#';
});
var loaders = [
{ test: /\.tsx?$/, loader: 'ng-annotate!awesome-typescript-loader'},
{test: /[\/]angular\.js$/, loader: 'exports?angular'},
{test: /[\/]jquery\.js$/, loader: 'expose?jQuery'},
{test: /[\/]dragula\.js$/, loader: 'expose?dragula'},
{test: /[\/]moment\.js$/, loader: 'expose?moment'},
{test: /[\/]mousetrap\.js$/, loader: 'expose?Mousetrap'},
{ test: /\.tsx?$/, loader: 'ng-annotate-loader!ts-loader'},
{
test: /\.css$/,
loader: ExtractTextPlugin.extract(
'style-loader',
'css-loader!postcss-loader'
)
loader: ExtractTextPlugin.extract({
fallbackLoader: 'style-loader',
loader: 'css-loader!postcss-loader',
publicPath: '/assets/bundles/'
})
},
{test: /\.png$/, loader: 'url-loader?limit=100000&mimetype=image/png'},
{test: /\.gif$/, loader: 'file-loader'},
{test: /\.jpg$/, loader: 'file-loader'},
{test: /[\/].*\.js$/, loader: 'ng-annotate?map=true'}
{test: /[\/].*\.js$/, loader: 'ng-annotate-loader?map=true'}
];
for (var k in pathConfig.pluginNamesPaths) {
if (pathConfig.pluginNamesPaths.hasOwnProperty(k)) {
loaders.push({
test: new RegExp('templates/plugin-' + k.replace(/^openproject\-/, '') + '/.*\.html$'),
loader: 'ngtemplate?module=openproject.templates&relativeTo=' +
path.join(pathConfig.pluginNamesPaths[k], 'frontend', 'app') + '!html?-minimize'
loader: 'ngtemplate-loader?module=openproject.templates&relativeTo=' +
path.join(pathConfig.pluginNamesPaths[k], 'frontend', 'app') + '!html-loader?-minimize'
});
}
}
loaders.push({
test: /^((?!templates\/plugin).)*\.html$/,
loader: 'ngtemplate?module=openproject.templates&relativeTo=' +
path.resolve(__dirname, './app') + '!html?-minimize'
loader: 'ngtemplate-loader?module=openproject.templates&relativeTo=' +
path.resolve(__dirname, './app') + '!html-loader?-minimize'
});
function getWebpackMainConfig() {
config = {
context: path.join(__dirname, '/app'),
context: path.resolve(__dirname, 'app'),
entry: _.merge({
'global': './global.js',
'core-app': './openproject-app.js'
'global': './global',
'core-app': './openproject-app'
}, pluginEntries),
output: {
@@ -123,14 +114,16 @@ function getWebpackMainConfig() {
},
resolve: {
root: [
modules: [
path.resolve(__dirname, 'app'),
path.resolve(__dirname, 'tests')
],
path.resolve(__dirname, 'tests'),
'node_modules',
].concat(pathConfig.pluginDirectories),
extensions: ['', '.webpack.js', '.ts', '.js'],
extensions: ['.ts', '.tsx', '.js'],
modulesDirectories: ['node_modules'].concat(pathConfig.pluginDirectories),
// Allow empty import without extension
// enforceExtension: true,
alias: _.merge({
'locales': './../../config/locales',
@@ -140,7 +133,6 @@ function getWebpackMainConfig() {
'select2': path.resolve(__dirname, 'vendor', 'select2'),
'angular-truncate': 'angular-truncate/src/truncate',
'angular-context-menu': 'angular-context-menu/dist/angular-context-menu.js',
'lodash': path.resolve(node_root, 'lodash', 'dist', 'lodash.min.js'),
'mousetrap': 'mousetrap/mousetrap.js',
'ngFileUpload': 'ng-file-upload/dist/ng-file-upload.min.js',
// prevents using crossvent from dist and by that
@@ -150,19 +142,6 @@ function getWebpackMainConfig() {
}, pluginAliases)
},
resolveLoader: {
root: path.join(__dirname, '/node_modules')
},
ts: {
configFileName: path.resolve(__dirname, 'tsconfig.json')
},
// CSS postprocessing (autoprefixer)
postcss: [
autoprefixer({ browsers: browsersList, cascade: false })
],
externals: {
"I18n": "I18n"
},
@@ -174,7 +153,10 @@ function getWebpackMainConfig() {
TypeScriptDiscruptorPlugin,
// Extract CSS into its own bundle
new ExtractTextPlugin('openproject-[name].css'),
new ExtractTextPlugin({
filename: 'openproject-[name].css',
disable: false
}),
// Global variables provided in all entries
// We should avoid this since it reduces webpack
@@ -202,8 +184,10 @@ function getWebpackMainConfig() {
compressor: { warnings: false },
sourceMap: false
}),
new webpack.optimize.DedupePlugin(),
new webpack.optimize.OccurenceOrderPlugin()
new webpack.LoaderOptionsPlugin({
// Let loaders know that we're in minification mode
minimize: true,
})
);
}
frontend/webpack-test-config.js
+1 -1
View File
@@ -32,7 +32,7 @@ var getWebpackMainConfig = require('./webpack-main-config');
function getWebpackTestConfig() {
var webpackConfig = getWebpackMainConfig();
webpackConfig.entry = './openproject-tests.js';
webpackConfig.entry = './openproject-tests';
webpackConfig.output = {
path: path.join(__dirname, '/tests'),
filename: 'openproject-test-bundle.js'
package.json
-3
View File
@@ -9,9 +9,6 @@
"webpack-watch": "cd frontend && npm run webpack-watch"
},
"private": true,
"dependencies": {
"typescript": "^2.0.3"
},
"engines": {
"node": "6.9.1",
"npm": "4.0.0"