test more node version, fix packagist skript (#170)

ElectricMaxxx · web-flow · commit 573e55002c82 · 2018-06-23T17:51:31.000+02:00
* test more node version, fix packagist skript

* add them as own matrix entries

* fix npm script also

* fix curl call

* use several php versions

* try to use it as node_js

* use same php version for node_js tests only

* fix php version

* fix symfony doc link

* fix link to symfony doc

* test more node version, fix packagist skript

* add them as own matrix entries

* fix npm script also

* fix curl call

* use several php versions

* try to use it as node_js

* use same php version for node_js tests only

* fix php version

* up to webpack 4.0

* increase memory limit for lowest

* some style changes
diff --git a/.babelrc b/.babelrc
@@ -0,0 +1,5 @@
+{
+    "presets": [
+        "env"
+    ]
+}
diff --git a/.eslintrc.json b/.eslintrc.json
@@ -0,0 +1,143 @@
+{
+  "rules": {
+    "no-negated-in-lhs": "error",
+    "no-cond-assign": [
+      "error",
+      "except-parens"
+    ],
+    "curly": [
+      "error",
+      "all"
+    ],
+    "object-curly-spacing": [
+      "error",
+      "always"
+    ],
+    "computed-property-spacing": [
+      "error",
+      "always"
+    ],
+    "array-bracket-spacing": [
+      "error",
+      "always"
+    ],
+    "eqeqeq": [
+      "error",
+      "smart"
+    ],
+    "no-unused-expressions": "error",
+    "no-sequences": "error",
+    "no-nested-ternary": "error",
+    "no-unreachable": "error",
+    "wrap-iife": [
+      "error",
+      "inside"
+    ],
+    "no-caller": "error",
+    "quotes": [
+      "error",
+      "double"
+    ],
+    "no-undef": "error",
+    "no-unused-vars": "error",
+    "operator-linebreak": [
+      "error",
+      "after"
+    ],
+    "comma-style": [
+      "error",
+      "last"
+    ],
+    "camelcase": [
+      "error",
+      {
+        "properties": "never"
+      }
+    ],
+    "dot-notation": [
+      "error",
+      {
+        "allowPattern": "^[a-z]+(_[a-z]+)+$"
+      }
+    ],
+    "max-len": [
+      "error",
+      {
+        "code": 100,
+        "ignoreComments": true,
+        "ignoreUrls": true,
+        "ignoreRegExpLiterals": true
+      }
+    ],
+    "no-mixed-spaces-and-tabs": "error",
+    "no-trailing-spaces": "error",
+    "no-multi-str": "error",
+    "comma-dangle": [
+      "error",
+      "never"
+    ],
+    "comma-spacing": [
+      "error",
+      {
+        "before": false,
+        "after": true
+      }
+    ],
+    "space-before-blocks": [
+      "error",
+      "always"
+    ],
+    "space-in-parens": [
+      "error",
+      "always"
+    ],
+    "keyword-spacing": [
+      2
+    ],
+    "semi": [
+      "error",
+      "always"
+    ],
+    "semi-spacing": [
+      "error",
+      {
+        "after": true
+      }
+    ],
+    "space-infix-ops": "error",
+    "eol-last": "error",
+    "lines-around-comment": [
+      "error",
+      {
+        "beforeLineComment": true
+      }
+    ],
+    "linebreak-style": [
+      "error",
+      "unix"
+    ],
+    "no-with": "error",
+    "brace-style": "error",
+    "space-before-function-paren": [
+      "error",
+      "never"
+    ],
+    "no-loop-func": "error",
+    "no-spaced-func": "error",
+    "key-spacing": [
+      "error",
+      {
+        "beforeColon": false,
+        "afterColon": true
+      }
+    ],
+    "space-unary-ops": [
+      "error",
+      {
+        "words": false,
+        "nonwords": false
+      }
+    ],
+    "no-multiple-empty-lines": 2
+  }
+}
diff --git a/.travis.yml b/.travis.yml
@@ -3,6 +3,11 @@ language: php
 php:
   - 7.1
   - 7.2
+node_js:
+  - 6
+  - 7
+  - 8
+
 sudo: required
 
 cache:
@@ -26,12 +31,17 @@ env:
 
 matrix:
   include:
-    - php: 7.2
+    - php: 7.1
       dist: trusty
-      env:
-        - LANG=js
-        - NODE_RELEASE=6.x
+      node_js: 6
+      env: LANG=js
     - php: 7.1
+      node_js: 7
+      env: LANG=js
+    - php: 7.1
+      node_js: 8
+      env: LANG=js
+    - php: 7.2
       env: COMPOSER_FLAGS="--prefer-lowest" SYMFONY_VERSION=2.8.* SYMFONY_DEPRECATIONS_HELPER=weak
     - php: 7.2
       env: SYMFONY_VERSION=3.3.*
@@ -44,11 +54,13 @@ before_install:
   - if [ "$LANG" = "js" ]; then npm run travis:install; fi
   - if [ "$LANG" = "php" ]; then phpenv config-rm xdebug.ini || true; fi
   - phpenv config-rm xdebug.ini || true
+  - phpenv config-add travis.php.ini
+  - php -ini | grep memory_limit
   - composer self-update
   - if ! [ -z "$STABILITY" ]; then composer config minimum-stability ${STABILITY}; composer config prefer-stable true; fi;
   - if [ "$SYMFONY_VERSION" != "" ]; then composer require symfony/symfony:${SYMFONY_VERSION} --no-update; fi
   - export BRANCH=$(if [ "$TRAVIS_PULL_REQUEST" == "false" ]; then echo $TRAVIS_BRANCH; else echo $TRAVIS_PULL_REQUEST_BRANCH; fi)
-
+ 
 install: travis_wait composer update --prefer-dist $COMPOSER_FLAGS
 
 script:
diff --git a/_build.sh b/_build.sh
@@ -1,13 +1,15 @@
 #!/usr/bin/env bash
 set -e
 
+MODE=$1||development
+
 echo " * Installing Bower dependencies..."
 bower install
 
 echo ""
 echo " * Executing webpack..."
 # Compile all javascript files and minify them together with Fancytree
-webpack -p --progress
+webpack --mode ${MODE} -p --progress
 
 echo ""
 echo " * Copying required vendor files to public directory..."
diff --git a/karma.conf.js b/karma.conf.js
@@ -1,8 +1,8 @@
 var path = require('path');
 var webpackConfig = require('./webpack.config.js');
 webpackConfig.devtool = 'inline-source-map';
-webpackConfig.resolve.alias.bundle = path.join(__dirname, 'src/Resources/assets/js');
-webpackConfig.entry = {};
+webpackConfig.resolve.alias.bundle = path.resolve(__dirname, 'src/Resources/assets/js');
+
 
 module.exports = function(config) {
   config.set({
@@ -48,7 +48,7 @@ module.exports = function(config) {
     reporters: ['dots'],
 
     webpack: webpackConfig,
-    webpackMiddleware: { noInfo: true, stats: 'errors-only'},
+    webpackMiddleware: {stats: 'errors-only'},
 
     // web server port
     port: 9876,
diff --git a/package.json b/package.json
@@ -2,33 +2,37 @@
   "name": "symfony-cmf-tree-browser-bundle",
   "license": "MIT",
   "devDependencies": {
-    "babel-core": "^6.3.17",
-    "babel-loader": "^6.2.0",
-    "babel-preset-es2015": "^6.3.13",
+    "babel-core": "^6.26.3",
+    "babel-loader": "^7.1.4",
+    "babel-preset-env": "^1.7.0",
+    "babel-preset-es2015": "^6.24.1",
     "core-js": "^1.2.6",
     "css-loader": "^0.23.0",
-    "extract-text-webpack-plugin": "^0.9.1",
+    "eslint": "^4.19.1",
+    "extract-text-webpack-plugin": "^4.0.0-beta.0",
     "file-loader": "^0.8.5",
     "jasmine-ajax": "^3.1.0",
     "jasmine-core": "^2.2.0",
     "jasmine-jquery": "^2.0.6",
-    "karma": "^0.13.0",
+    "karma": "^2.0.4",
     "karma-chrome-launcher": "^0.1.7",
     "karma-firefox-launcher": "^0.1.4",
     "karma-ie-launcher": "^0.1.5",
     "karma-jasmine": "^0.3.5",
-    "karma-phantomjs-launcher": "^0.1.4",
-    "karma-sourcemap-loader": "^0.3.6",
-    "karma-webpack": "^1.7.0",
-    "style-loader": "^0.13.0",
-    "webpack": "^1.12.9"
+    "karma-phantomjs-launcher": "^1.0.4",
+    "karma-sourcemap-loader": "^0.3.7",
+    "karma-webpack": "^3.0.0",
+    "style-loader": "^0.13.2",
+    "webpack": "^4.0.1",
+    "webpack-cli": "^3.0.8",
+    "webpack-dev-middleware": "^2.0.6"
   },
   "scripts": {
-    "update:nodejs": "sudo rm -rf ~/.nvm - curl -sL 'https://deb.nodesource.com/setup_${NODE_RELEASE}' | sudo -E bash && sudo apt-get install -y nodejs",
-    "pretravis:install": "npm run update:nodejs && npm install -g bower && npm set progress=false",
+    "pretravis:install": "npm install -g bower && npm set progress=false",
     "travis:install": "npm install && bower install",
     "test": "\"node_modules/karma/bin/karma\" start --single-run --browsers PhantomJS",
-    "build": "sh _build.sh"
+    "build:dev": "sh _build.sh development",
+    "build:prod": "sh _build.sh production"
   },
   "repository": {
     "type": "git",
diff --git a/src/Resources/public/css/cmf_tree_browser.fancytree.css b/src/Resources/public/css/cmf_tree_browser.fancytree.css
diff --git a/src/Resources/public/js/cmf_tree_browser.fancytree.js b/src/Resources/public/js/cmf_tree_browser.fancytree.js
diff --git a/src/Resources/public/vendor/jquery/dist/jquery.min.js b/src/Resources/public/vendor/jquery/dist/jquery.min.js
diff --git a/travis.php.ini b/travis.php.ini
@@ -0,0 +1 @@
+memory_limit = -1
diff --git a/webpack.config.js b/webpack.config.js
@@ -3,47 +3,55 @@ var path = require('path');
 var ExtractTextPlugin = require("extract-text-webpack-plugin");
 
 module.exports = {
-  debug : true,
   context : path.join(__dirname, 'src/Resources/assets/'),
   entry : {
     fancytree : './js/jquery.cmf_tree.js'
   },
   output : {
-    path : path.join(__dirname, 'src/Resources/public/js'),
+    path : path.resolve(__dirname, 'src/Resources/public/js'),
     filename : 'cmf_tree_browser.[name].js'
   },
   externals : {
     'jquery' : 'jQuery'
   },
   module : {
-    loaders : [
+    rules: [
       {
-        test : /\.css$/i,
-        loader : ExtractTextPlugin.extract('style', 'css', {publicPath : '../js/'})
+        test: /\.js$/,
+        exclude: /node_modules/,
+        use: {
+          loader: "babel-loader"
+        }
       },
       {
-        test : /(assets|Tests).+?\.js$/i, loader : 'babel-loader', query : {presets : ['es2015']}
+        test: /\.css$/,
+        use: ExtractTextPlugin.extract(
+          {
+            fallback: 'style-loader',
+            use: ['css-loader']
+          })
       },
       {
-        test : /\.(jpe?g|png|gif|svg)$/i, loader : 'file?name=../img/[hash].[ext]'
+        test : /(assets|Tests).+?\.js$/i,
+        use: {
+          loader : 'babel-loader', query : {presets : ['es2015']}
+        }
+      },
+      {
+        test : /\.(jpe?g|png|gif|svg)$/i,
+        use:  'file-loader?name=../img/[hash].[ext]&context=default'
       }
     ]
   },
   resolve : {
-    root : __dirname,
     alias : {
       jquery : path.join(__dirname, 'bower_components/jquery/dist/jquery.js'),
       'jquery-ui' : path.join(__dirname, 'bower_components/jquery-ui/jquery-ui.js'),
       fancytree : path.join(__dirname, 'bower_components/fancytree/dist'),
       'core-js' : path.join(__dirname, 'node_modules/core-js')
     }
   },
-  resolveLoader : {
-    modulesDirectories : [path.join(__dirname, 'node_modules')]
-  },
   plugins : [
-    // required once multiple entry files are used (e.g. for different adapters)
-    //new webpack.optimize.CommonsChunkPlugin('common.cmf_tree_browser.js')
-    new ExtractTextPlugin('../css/cmf_tree_browser.[name].css')
+    new ExtractTextPlugin({filename: '../css/cmf_tree_browser.[name].css'})
   ]
 };

-Original file line number
+Diff line change
@@ @@ -0,0 +1,5 @@ @@
 +{
 +    "presets": [
 +        "env"
 +    ]
 +}