Merge pull request #5075 from opf/fix/postcss-deprecation

Replace autoprefixer-loader with postcss
pull/5070/merge
Oliver Günther 8 years ago committed by GitHub
commit ec368df85d
  1. 129
      frontend/npm-shrinkwrap.json
  2. 3
      frontend/package.json
  3. 12
      frontend/webpack-main-config.js

@ -58,14 +58,12 @@
"ansi-regex": {
"version": "2.0.0",
"from": "ansi-regex@>=2.0.0 <3.0.0",
"resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.0.0.tgz",
"dev": true
"resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.0.0.tgz"
},
"ansi-styles": {
"version": "2.2.1",
"from": "ansi-styles@>=2.2.1 <3.0.0",
"resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz",
"dev": true
"resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz"
},
"anymatch": {
"version": "1.3.0",
@ -75,8 +73,7 @@
"argparse": {
"version": "1.0.9",
"from": "argparse@>=1.0.7 <2.0.0",
"resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.9.tgz",
"dev": true
"resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.9.tgz"
},
"arr-diff": {
"version": "2.0.0",
@ -148,6 +145,33 @@
"from": "atoa@>=1.0.0 <2.0.0",
"resolved": "https://registry.npmjs.org/atoa/-/atoa-1.0.0.tgz"
},
"autoprefixer": {
"version": "6.5.3",
"from": "autoprefixer@latest",
"resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-6.5.3.tgz",
"dependencies": {
"browserslist": {
"version": "1.4.0",
"from": "browserslist@>=1.4.0 <1.5.0",
"resolved": "https://registry.npmjs.org/browserslist/-/browserslist-1.4.0.tgz"
},
"caniuse-db": {
"version": "1.0.30000587",
"from": "caniuse-db@>=1.0.30000578 <2.0.0",
"resolved": "https://registry.npmjs.org/caniuse-db/-/caniuse-db-1.0.30000587.tgz"
},
"postcss": {
"version": "5.2.6",
"from": "postcss@>=5.2.5 <6.0.0",
"resolved": "https://registry.npmjs.org/postcss/-/postcss-5.2.6.tgz"
},
"source-map": {
"version": "0.5.6",
"from": "source-map@>=0.5.6 <0.6.0",
"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.6.tgz"
}
}
},
"autoprefixer-core": {
"version": "5.2.1",
"from": "autoprefixer-core@>=5.0.0 <6.0.0",
@ -374,13 +398,11 @@
"version": "1.1.3",
"from": "chalk@>=1.1.1 <2.0.0",
"resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
"dev": true,
"dependencies": {
"supports-color": {
"version": "2.0.0",
"from": "supports-color@>=2.0.0 <3.0.0",
"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz",
"dev": true
"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz"
}
}
},
@ -601,6 +623,18 @@
"from": "core-util-is@>=1.0.0 <1.1.0",
"resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz"
},
"cosmiconfig": {
"version": "2.1.0",
"from": "cosmiconfig@>=2.1.0 <3.0.0",
"resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-2.1.0.tgz",
"dependencies": {
"minimist": {
"version": "1.2.0",
"from": "minimist@>=1.2.0 <2.0.0",
"resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz"
}
}
},
"crc": {
"version": "3.3.0",
"from": "crc@3.3.0",
@ -815,8 +849,7 @@
"error-ex": {
"version": "1.3.0",
"from": "error-ex@>=1.2.0 <2.0.0",
"resolved": "https://registry.npmjs.org/error-ex/-/error-ex-1.3.0.tgz",
"dev": true
"resolved": "https://registry.npmjs.org/error-ex/-/error-ex-1.3.0.tgz"
},
"errorhandler": {
"version": "1.4.3",
@ -884,8 +917,7 @@
"escape-string-regexp": {
"version": "1.0.5",
"from": "escape-string-regexp@>=1.0.2 <2.0.0",
"resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
"dev": true
"resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz"
},
"escodegen": {
"version": "1.7.1",
@ -2064,8 +2096,7 @@
"has-ansi": {
"version": "2.0.0",
"from": "has-ansi@>=2.0.0 <3.0.0",
"resolved": "https://registry.npmjs.org/has-ansi/-/has-ansi-2.0.0.tgz",
"dev": true
"resolved": "https://registry.npmjs.org/has-ansi/-/has-ansi-2.0.0.tgz"
},
"has-flag": {
"version": "1.0.0",
@ -2255,8 +2286,7 @@
"is-arrayish": {
"version": "0.2.1",
"from": "is-arrayish@>=0.2.1 <0.3.0",
"resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz",
"dev": true
"resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz"
},
"is-binary-path": {
"version": "1.0.1",
@ -2446,13 +2476,11 @@
"version": "3.6.1",
"from": "js-yaml@>=3.0.0 <4.0.0",
"resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.6.1.tgz",
"dev": true,
"dependencies": {
"esprima": {
"version": "2.7.3",
"from": "esprima@>=2.6.0 <3.0.0",
"resolved": "https://registry.npmjs.org/esprima/-/esprima-2.7.3.tgz",
"dev": true
"resolved": "https://registry.npmjs.org/esprima/-/esprima-2.7.3.tgz"
}
}
},
@ -3151,6 +3179,11 @@
"from": "normalize-path@>=2.0.1 <3.0.0",
"resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-2.0.1.tgz"
},
"normalize-range": {
"version": "0.1.2",
"from": "normalize-range@>=0.1.2 <0.2.0",
"resolved": "https://registry.npmjs.org/normalize-range/-/normalize-range-0.1.2.tgz"
},
"num2fraction": {
"version": "1.2.2",
"from": "num2fraction@>=1.1.0 <2.0.0",
@ -3257,6 +3290,11 @@
"from": "os-browserify@>=0.1.2 <0.2.0",
"resolved": "https://registry.npmjs.org/os-browserify/-/os-browserify-0.1.2.tgz"
},
"os-homedir": {
"version": "1.0.2",
"from": "os-homedir@>=1.0.1 <2.0.0",
"resolved": "https://registry.npmjs.org/os-homedir/-/os-homedir-1.0.2.tgz"
},
"pako": {
"version": "0.2.9",
"from": "pako@>=0.2.0 <0.3.0",
@ -3270,8 +3308,7 @@
"parse-json": {
"version": "2.2.0",
"from": "parse-json@>=2.2.0 <3.0.0",
"resolved": "https://registry.npmjs.org/parse-json/-/parse-json-2.2.0.tgz",
"dev": true
"resolved": "https://registry.npmjs.org/parse-json/-/parse-json-2.2.0.tgz"
},
"parseurl": {
"version": "1.3.1",
@ -3378,6 +3415,43 @@
"from": "postcss@>=4.1.12 <4.2.0",
"resolved": "https://registry.npmjs.org/postcss/-/postcss-4.1.16.tgz"
},
"postcss-load-config": {
"version": "1.0.0",
"from": "postcss-load-config@>=1.0.0 <2.0.0",
"resolved": "https://registry.npmjs.org/postcss-load-config/-/postcss-load-config-1.0.0.tgz"
},
"postcss-load-options": {
"version": "1.0.2",
"from": "postcss-load-options@>=1.0.2 <2.0.0",
"resolved": "https://registry.npmjs.org/postcss-load-options/-/postcss-load-options-1.0.2.tgz"
},
"postcss-load-plugins": {
"version": "2.0.0",
"from": "postcss-load-plugins@>=2.0.0 <3.0.0",
"resolved": "https://registry.npmjs.org/postcss-load-plugins/-/postcss-load-plugins-2.0.0.tgz"
},
"postcss-loader": {
"version": "1.1.1",
"from": "postcss-loader@latest",
"resolved": "https://registry.npmjs.org/postcss-loader/-/postcss-loader-1.1.1.tgz",
"dependencies": {
"postcss": {
"version": "5.2.6",
"from": "postcss@^5.2.5",
"resolved": "https://registry.npmjs.org/postcss/-/postcss-5.2.6.tgz"
},
"source-map": {
"version": "0.5.6",
"from": "source-map@^0.5.6",
"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.6.tgz"
}
}
},
"postcss-value-parser": {
"version": "3.3.0",
"from": "postcss-value-parser@>=3.2.3 <4.0.0",
"resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.0.tgz"
},
"prelude-ls": {
"version": "1.1.2",
"from": "prelude-ls@>=1.1.1 <1.2.0",
@ -3553,6 +3627,11 @@
"resolved": "https://registry.npmjs.org/request-progress/-/request-progress-2.0.1.tgz",
"dev": true
},
"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"
},
"requires-port": {
"version": "1.0.0",
"from": "requires-port@>=1.0.0 <2.0.0",
@ -3829,8 +3908,7 @@
"sprintf-js": {
"version": "1.0.3",
"from": "sprintf-js@>=1.0.2 <1.1.0",
"resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz",
"dev": true
"resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz"
},
"sshpk": {
"version": "1.10.1",
@ -3924,8 +4002,7 @@
"strip-ansi": {
"version": "3.0.1",
"from": "strip-ansi@>=3.0.0 <4.0.0",
"resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
"dev": true
"resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz"
},
"strip-bom": {
"version": "2.0.0",

@ -32,7 +32,7 @@
"angular-elastic": "^2.5.0",
"angular-ui-bootstrap": "^2.2.0",
"atoa": "^1.0.0",
"autoprefixer-loader": "^1.2.0",
"autoprefixer": "^6.5.3",
"awesome-typescript-loader": "^2.2.4",
"bower": "^1.4.1",
"css-loader": "^0.9.0",
@ -49,6 +49,7 @@
"ngtemplate-loader": "^0.1.2",
"observable-array": "0.0.4",
"phantomjs-polyfill": "0.0.2",
"postcss-loader": "^1.1.1",
"shelljs": "^0.3.0",
"style-loader": "^0.8.2",
"typescript": "^2.0.3",

@ -31,6 +31,7 @@ var fs = require('fs');
var path = require('path');
var _ = require('lodash');
var pathConfig = require('./rails-plugins.conf');
var autoprefixer = require('autoprefixer');
var TypeScriptDiscruptorPlugin = require('./webpack/typescript-disruptor.plugin.js');
var ExtractTextPlugin = require('extract-text-webpack-plugin');
@ -56,9 +57,9 @@ fs.readdirSync(translations).forEach(function (file) {
});
var browsersListConfig = fs.readFileSync(path.join(__dirname, '..', 'browserslist'), 'utf8');
var browsersList = JSON.stringify(_.filter(browsersListConfig.split('\n'), function (entry) {
var browsersList = _.filter(browsersListConfig.split('\n'), function (entry) {
return entry && entry.charAt(0) !== '#';
}));
});
var loaders = [
{ test: /\.tsx?$/, loader: 'ng-annotate!awesome-typescript-loader'},
@ -71,7 +72,7 @@ var loaders = [
test: /\.css$/,
loader: ExtractTextPlugin.extract(
'style-loader',
'css-loader!autoprefixer-loader?{browsers:' + browsersList + ',cascade:false}'
'css-loader!postcss-loader'
)
},
{test: /\.png$/, loader: 'url-loader?limit=100000&mimetype=image/png'},
@ -156,6 +157,11 @@ function getWebpackMainConfig() {
configFileName: path.resolve(__dirname, 'tsconfig.json')
},
// CSS postprocessing (autoprefixer)
postcss: [
autoprefixer({ browsers: browsersList, cascade: false })
],
externals: {
"I18n": "I18n"
},

Loading…
Cancel
Save