Rename minified library distribution version to lab.js

FelixHenninger · FelixHenninger · commit 695d3605631b · 2017-05-01T14:56:32.000+02:00
diff --git a/builder/src/logic/io/export/index.js b/builder/src/logic/io/export/index.js
@@ -11,8 +11,8 @@ import Raven from 'raven-js'
 
 export const staticFiles = [
   'lib/lab.css',
-  'lib/lab.min.js',
-  'lib/lab.min.js.map',
+  'lib/lab.js',
+  'lib/lab.js.map',
   'lib/loading.svg',
 ]
 
diff --git a/builder/src/logic/io/save.js b/builder/src/logic/io/save.js
@@ -25,7 +25,7 @@ export const stateToJSON = (state, exportedComponent='root') => {
     : [ exportedComponent ]
 
   return JSON.stringify({
-    version: [2017, 1, 0],
+    version: [2017, 1, 1],
     components,
     files,
   }, null, 2)
diff --git a/builder/src/logic/io/upgrade.js b/builder/src/logic/io/upgrade.js
@@ -89,7 +89,28 @@ const updates = {
   '2017.0.5': data => ({
     ...data,
     version: [2017, 1, 0],
-  })
+  }),
+  '2017.1.0': data => {
+    // Move library to lab.js (instead of lab.min.js),
+    // include source map
+    if (data.files.files['index.html']) {
+      data.files.files['index.html'].content =
+        data.files.files['index.html'].content.replace(
+          'src="lib/lab.min.js"',
+          'src="lib/lab.js"',
+        )
+    }
+
+    if (data.files.bundledFiles['lib/lab.min.js']) {
+      delete data.files.bundledFiles['lib/lab.min.js']
+    }
+
+    data.files.bundledFiles['lib/lab.js'] = { type: 'application/javascript' }
+    data.files.bundledFiles['lib/lab.js.map'] = { type: 'text/plain' }
+
+    data.version = [2017, 1, 1]
+    return data
+  },
 }
 
 export default (data) => {
diff --git a/builder/src/reducers/files.js b/builder/src/reducers/files.js
@@ -4,7 +4,7 @@ const index_html = `<!doctype html>
   <meta charset="utf-8">
   <title>Experiment</title>
   <!-- lab.js library and default styles -->
-  <script src="lib/lab.min.js"></script>
+  <script src="lib/lab.js"></script>
   <link rel="stylesheet" href="lib/lab.css">
   <!-- study code and styles -->
   <script defer src="script.js"></script>
@@ -39,9 +39,12 @@ const defaultState = {
     }
   },
   bundledFiles: {
-    'lib/lab.min.js': {
+    'lib/lab.js': {
       type: 'application/javascript',
     },
+    'lib/lab.js.map': {
+      type: 'text/plain',
+    },
     'lib/lab.css': {
       type: 'text/css',
     },
diff --git a/library/package.json b/library/package.json
@@ -8,7 +8,7 @@
     "type": "git",
     "url": "https://github.com/felixhenninger/lab.js.git"
   },
-  "main": "dist/lab.min.js",
+  "main": "dist/lab.js",
   "module": "src/index.js",
   "dependencies": {
     "babel-polyfill": "^6.23.0",
@@ -70,7 +70,7 @@
     "build:js:production": "webpack",
     "build:js": "npm run build:js:development && npm run build:js:production",
     "build:starterkit:css": "postcss --local-plugins -u postcss-cssnext -o dist/labjs-starterkit/lib/lab.css src/starterkit/lib/lab.css",
-    "build:starterkit:static": "cp src/starterkit/index.html dist/labjs-starterkit && cp src/starterkit/experiment.js dist/labjs-starterkit && cp dist/lab.dev.js dist/labjs-starterkit/lib && cp dist/lab.min.js dist/labjs-starterkit/lib && cp dist/lab.min.js.map dist/labjs-starterkit/lib && cp src/starterkit/lib/loading.svg dist/labjs-starterkit/lib",
+    "build:starterkit:static": "cp src/starterkit/index.html dist/labjs-starterkit && cp src/starterkit/experiment.js dist/labjs-starterkit && cp dist/lab.dev.js dist/labjs-starterkit/lib && cp dist/lab.js dist/labjs-starterkit/lib && cp dist/lab.js.map dist/labjs-starterkit/lib && cp src/starterkit/lib/loading.svg dist/labjs-starterkit/lib",
     "build:starterkit:bundle": "cd dist && zip -r labjs-starterkit.zip labjs-starterkit",
     "build:starterkit": "npm run build:js && npm run build:starterkit:css && npm run build:starterkit:static && npm run build:starterkit:bundle",
     "clean:docs": "cd docs && make clean",
diff --git a/library/src/starterkit/index.html b/library/src/starterkit/index.html
@@ -4,7 +4,7 @@
   <meta charset="utf-8">
   <title>Experiment</title>
   <!-- lab.js and libraries -->
-  <script src="lib/lab.dev.js"></script>
+  <script src="lib/lab.js"></script>
   <link rel="stylesheet" href="lib/lab.css">
   <!-- actual experiment code -->
   <script defer src="experiment.js"></script>
diff --git a/library/webpack.config.js b/library/webpack.config.js
@@ -10,7 +10,7 @@ const minimize = !process.argv.find(x => x === '-d')
 let outputFilename
 
 if (minimize) {
-  outputFilename = 'lab.min.js'
+  outputFilename = 'lab.js'
 } else {
   outputFilename = 'lab.dev.js'
 }

Original file line number	Diff line number	Diff line change
`@@ -11,8 +11,8 @@ import Raven from 'raven-js'`
`11`	`11`
`12`	`12`	`export const staticFiles = [`
`13`	`13`	`'lib/lab.css',`
`14`		`- 'lib/lab.min.js',`
`15`		`- 'lib/lab.min.js.map',`
	`14`	`+ 'lib/lab.js',`
	`15`	`+ 'lib/lab.js.map',`
`16`	`16`	`'lib/loading.svg',`
`17`	`17`	`]`
`18`	`18`
Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@ const minimize = !process.argv.find(x => x === '-d')`
`10`	`10`	`let outputFilename`
`11`	`11`
`12`	`12`	`if (minimize) {`
`13`		`- outputFilename = 'lab.min.js'`
	`13`	`+ outputFilename = 'lab.js'`
`14`	`14`	`} else {`
`15`	`15`	`outputFilename = 'lab.dev.js'`
`16`	`16`	`}`