From 64e592c3698d0ca54577aad450a5a4645b8e9c82 Mon Sep 17 00:00:00 2001 From: Aleksandr Rogozin Date: Sat, 6 Jul 2019 19:43:43 +0300 Subject: [PATCH 1/6] Package.json -> Scripts. To generate a source map, use --source-map --- .gitignore | 1 + package.json | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index abfa65ee2..5e5fa1e96 100644 --- a/.gitignore +++ b/.gitignore @@ -11,3 +11,4 @@ ad.js TODO test.html .vscode/ +.vs/ diff --git a/package.json b/package.json index c71da1e74..3cc796522 100644 --- a/package.json +++ b/package.json @@ -9,7 +9,7 @@ "css": "npm-run-all --sequential css-compile css-prefix css-minify", "css-compile": "node-sass --output-style expanded --source-map true --source-map-contents true --precision 6 build/scss/AdminLTE.scss dist/css/adminlte.css", "css-prefix": "postcss --config build/config/postcss.config.js --replace \"dist/css/*.css\" \"!dist/css/*.min.css\"", - "css-minify": "cleancss --level 1 --source-map dist/css/adminlte.css.map --output dist/css/adminlte.min.css dist/css/adminlte.css", + "css-minify": "cleancss --level 1 --source-map --output dist/css/adminlte.min.css dist/css/adminlte.css", "compile": "npm-run-all --parallel js css", "dev": "npm-run-all --parallel watch sync", "js": "npm-run-all --sequential js-compile js-minify", From 5db40b310f8484a6fa9e19cb846b81daaa83fc8e Mon Sep 17 00:00:00 2001 From: andymark-by <39381353+andymark-by@users.noreply.github.com> Date: Wed, 10 Jul 2019 14:32:32 +0300 Subject: [PATCH 2/6] Bootstarap 3 > 4 Edit bootstarap 3 > 4 --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 8dcfa26c4..8306ceb27 100644 --- a/composer.json +++ b/composer.json @@ -1,6 +1,6 @@ { "name": "almasaeed2010/adminlte", - "description": "AdminLTE - admin control panel and dashboard that's based on Bootstrap 3", + "description": "AdminLTE - admin control panel and dashboard that's based on Bootstrap 4", "homepage": "http://adminlte.io/", "keywords": [ "css", From 0dfa558aef6ce47a0b48f98110235761bd6d8983 Mon Sep 17 00:00:00 2001 From: Aleksandr Rogozin Date: Thu, 11 Jul 2019 15:42:43 +0300 Subject: [PATCH 3/6] Change "js-compile" script. Moving settings files to one place. --- rollup.config.js => build/config/rollup.config.js | 5 +++-- package.json | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) rename rollup.config.js => build/config/rollup.config.js (83%) diff --git a/rollup.config.js b/build/config/rollup.config.js similarity index 83% rename from rollup.config.js rename to build/config/rollup.config.js index cdac2753d..19635b567 100644 --- a/rollup.config.js +++ b/build/config/rollup.config.js @@ -1,6 +1,6 @@ import babel from 'rollup-plugin-babel' -const pkg = require('./package') +const pkg = require('../../package') const year = new Date().getFullYear() const globals = { @@ -22,7 +22,8 @@ export default { }, plugins: [ babel({ - exclude: 'node_modules/**' + exclude: 'node_modules/**', + externalHelpers: true }) ] } diff --git a/package.json b/package.json index 3cc796522..3dddeeaf2 100644 --- a/package.json +++ b/package.json @@ -13,7 +13,7 @@ "compile": "npm-run-all --parallel js css", "dev": "npm-run-all --parallel watch sync", "js": "npm-run-all --sequential js-compile js-minify", - "js-compile": "rollup -c --sourcemap", + "js-compile": "rollup --config build/config/rollup.config.js --sourcemap", "js-minify": "uglifyjs --compress typeofs=false --mangle --comments \"/^!/\" --source-map \"content=dist/js/adminlte.js.map,includeSources,url=adminlte.min.js.map\" --output dist/js/adminlte.min.js dist/js/adminlte.js", "production": "npm-run-all --parallel compile && node build/npm/Publish.js -v", "plugins": "node build/npm/Publish.js -v", From 03ed07ba8ee945e93c4ac2a999f66fd075146b1b Mon Sep 17 00:00:00 2001 From: Aleksandr Rogozin Date: Fri, 12 Jul 2019 15:58:45 +0300 Subject: [PATCH 4/6] Updating devDependencies for "js-compile" script. --- build/config/rollup.config.js | 2 +- package.json | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/build/config/rollup.config.js b/build/config/rollup.config.js index 19635b567..d11cecdfe 100644 --- a/build/config/rollup.config.js +++ b/build/config/rollup.config.js @@ -23,7 +23,7 @@ export default { plugins: [ babel({ exclude: 'node_modules/**', - externalHelpers: true + babelHelpers: "external" }) ] } diff --git a/package.json b/package.json index 3dddeeaf2..bbd50c1a6 100644 --- a/package.json +++ b/package.json @@ -82,10 +82,10 @@ "toastr": "^2.1.4" }, "devDependencies": { - "@babel/cli": "^7.4.4", - "@babel/core": "^7.4.5", + "@babel/cli": "^7.5.0", + "@babel/core": "^7.5.4", "@babel/plugin-external-helpers": "^7.2.0", - "@babel/preset-env": "^7.4.5", + "@babel/preset-env": "^7.5.4", "autoprefixer": "^8.6.5", "babel-eslint": "^8.2.6", "browser-sync": "^2.26.7", @@ -101,8 +101,8 @@ "npm-run-all": "^4.1.5", "path": "^0.12.7", "postcss-cli": "^5.0.1", - "rollup": "^1.15.1", - "rollup-plugin-babel": "^4.3.2", + "rollup": "^1.16.7", + "rollup-plugin-babel": "^5.0.0-alpha.0", "style-loader": "^0.19.1", "uglify-js": "^3.6.0" } From 78c74fda2f91e39392196bb457bda6a80664f2df Mon Sep 17 00:00:00 2001 From: Aleksandr Rogozin Date: Sat, 13 Jul 2019 00:01:56 +0300 Subject: [PATCH 5/6] Revert "Updating devDependencies for "js-compile" script." This reverts commit 03ed07ba8ee945e93c4ac2a999f66fd075146b1b. --- build/config/rollup.config.js | 2 +- package.json | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/build/config/rollup.config.js b/build/config/rollup.config.js index d11cecdfe..19635b567 100644 --- a/build/config/rollup.config.js +++ b/build/config/rollup.config.js @@ -23,7 +23,7 @@ export default { plugins: [ babel({ exclude: 'node_modules/**', - babelHelpers: "external" + externalHelpers: true }) ] } diff --git a/package.json b/package.json index bbd50c1a6..3dddeeaf2 100644 --- a/package.json +++ b/package.json @@ -82,10 +82,10 @@ "toastr": "^2.1.4" }, "devDependencies": { - "@babel/cli": "^7.5.0", - "@babel/core": "^7.5.4", + "@babel/cli": "^7.4.4", + "@babel/core": "^7.4.5", "@babel/plugin-external-helpers": "^7.2.0", - "@babel/preset-env": "^7.5.4", + "@babel/preset-env": "^7.4.5", "autoprefixer": "^8.6.5", "babel-eslint": "^8.2.6", "browser-sync": "^2.26.7", @@ -101,8 +101,8 @@ "npm-run-all": "^4.1.5", "path": "^0.12.7", "postcss-cli": "^5.0.1", - "rollup": "^1.16.7", - "rollup-plugin-babel": "^5.0.0-alpha.0", + "rollup": "^1.15.1", + "rollup-plugin-babel": "^4.3.2", "style-loader": "^0.19.1", "uglify-js": "^3.6.0" } From 36ae4e24456aef1b7cfd13312cf5cc2ada5b5163 Mon Sep 17 00:00:00 2001 From: Aleksandr Rogozin Date: Sat, 13 Jul 2019 12:45:22 +0300 Subject: [PATCH 6/6] Updating devDependencies for "js" script. --- package.json | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index 3dddeeaf2..5816054e9 100644 --- a/package.json +++ b/package.json @@ -82,10 +82,10 @@ "toastr": "^2.1.4" }, "devDependencies": { - "@babel/cli": "^7.4.4", - "@babel/core": "^7.4.5", + "@babel/cli": "^7.5.0", + "@babel/core": "^7.5.4", "@babel/plugin-external-helpers": "^7.2.0", - "@babel/preset-env": "^7.4.5", + "@babel/preset-env": "^7.5.4", "autoprefixer": "^8.6.5", "babel-eslint": "^8.2.6", "browser-sync": "^2.26.7", @@ -101,8 +101,8 @@ "npm-run-all": "^4.1.5", "path": "^0.12.7", "postcss-cli": "^5.0.1", - "rollup": "^1.15.1", - "rollup-plugin-babel": "^4.3.2", + "rollup": "^1.16.7", + "rollup-plugin-babel": "^4.3.3", "style-loader": "^0.19.1", "uglify-js": "^3.6.0" }