Dev: rebuild minified adminbasics

LimeSurvey · Sep 3, 2019 · de19668 · de19668
1 parent 7a8435b
commit de19668
Show file tree

Hide file tree

Showing 9 changed files with 26 additions and 22 deletions.
diff --git a/.gitignore b/.gitignore
@@ -19,6 +19,7 @@
 !.travis.yml
 !.babelrc
 !.eslintrc
+!.env-cmdrc
 
 
 # upload directory : whole except the index.html and readme.txt

diff --git a/application/config/packages.php b/application/config/packages.php
@@ -246,16 +246,8 @@
         'devBaseUrl' => 'assets/packages/adminbasics/',
         'basePath' => 'core.adminbasics',
         'position' =>CClientScript::POS_HEAD,
-        // 'css' => array(
-        //     'css/lime-admin-common.css',
-        //     'css/jcarousel.responsive.css',
-        //     'css/attributeMap.css',
-        //     'css/attributeMapToken.css',
-        //     'css/displayParticipants.css',
-        //     'build/adminbasics'.(($debug > 0) ? '' : '.min').'.css',
-        // ),
         'js' => array(
-            'build/adminbasics'.(($debug > 0) ? '' : '.min').'.js',
+            'build/adminbasics'.$minVersion.'.js',
         ),
         'depends' => array(
             'jquery',

diff --git a/assets/packages/adminbasics/.env-cmdrc b/assets/packages/adminbasics/.env-cmdrc
@@ -0,0 +1,8 @@
+{
+  "dev": {
+    "NODE_ENV": "developement"
+  },
+  "prod": {
+    "NODE_ENV": "production"
+  }
+}
diff --git a/assets/packages/adminbasics/build/adminbasics.min.css b/assets/packages/adminbasics/build/adminbasics.min.css
diff --git a/assets/packages/adminbasics/build/adminbasics.min.js b/assets/packages/adminbasics/build/adminbasics.min.js
diff --git a/assets/packages/adminbasics/build/adminbasics.rtl.min.css b/assets/packages/adminbasics/build/adminbasics.rtl.min.css
diff --git a/assets/packages/adminbasics/package.json b/assets/packages/adminbasics/package.json
@@ -3,11 +3,9 @@
   "license": "GPL-3.0",
   "author": "LimeSurvey DevTeam",
   "scripts": {
-    "devltr": "env-cmd -e devltr rollup -c",
-    "devrtl": "env-cmd -e devrtl rollup -c",
-    "buildltr": "env-cmd -e prodltr rollup -c",
-    "buildrtl": "env-cmd -e prodrtl rollup -c",
-    "build": "yarn run devltr && yarn run buildltr"
+    "dev": "env-cmd -e dev rollup -c",
+    "prod": "env-cmd -e prod rollup -c",
+    "build": "yarn run dev && yarn run prod"
   },
   "devDependencies": {
     "@babel/core": "^7.4.4",

diff --git a/assets/packages/adminbasics/rollup.config.js b/assets/packages/adminbasics/rollup.config.js
@@ -7,9 +7,8 @@ import { terser } from "rollup-plugin-terser";
 import WriteRTLCSS from './buildplugins/rollup-plugin-writertlcss';
 
 const ENVIRONEMENT = process.env.NODE_ENV.trim();
-const DIRECTION = process.env.DIRECTION_ENV.trim();
 
-console.log(`Building adminbasics for mode ${ENVIRONEMENT} and direction ${DIRECTION}`);
+console.log(`Building adminbasics for mode ${ENVIRONEMENT}`);
 
 
 let plugins =  [];
@@ -24,8 +23,7 @@ if( ENVIRONEMENT=='production' ) {
     plugins = [
         replace({
             ENVENVIRONEMENT:ENVIRONEMENT,
-            'process.env.NODE_ENV': ENVIRONEMENT,
-            ENVDIRECTION:DIRECTION,
+            'process.env.NODE_ENV': JSON.stringify(ENVIRONEMENT),
             'process.env.VUE_ENV': JSON.stringify('browser')
         }),
         babel({exclude: 'node_modules/**'}),
@@ -45,7 +43,6 @@ if( ENVIRONEMENT=='production' ) {
         replace({
             ENVENVIRONEMENT:ENVIRONEMENT,
             'process.env.NODE_ENV': JSON.stringify(ENVIRONEMENT),
-            ENVDIRECTION:DIRECTION,
             'process.env.VUE_ENV': JSON.stringify('browser')
         }),
         babel({exclude: 'node_modules/**'}),

diff --git a/assets/packages/lstutorial/.env-cmdrc b/assets/packages/lstutorial/.env-cmdrc
@@ -0,0 +1,8 @@
+{
+  "dev": {
+    "NODE_ENV": "developement"
+  },
+  "prod": {
+    "NODE_ENV": "production"
+  }
+}