amber-dev - npm Package Compare versions

Comparing version 0.1.0 to 0.1.1

lib/amberc.js

@@ -41,3 +41,4 @@ /**
 				'var define = (' + require('amdefine') + ')(null, function (id) { throw new Error("Dependency not found: " +  id); }), requirejs = define.require;',
-				'define("amber_vm/browser-compatibility", [], {});'
+				'define("amber_vm/browser-compatibility", [], {});',
+				'define("amber/browser-compatibility", [], {});'
 			);
@@ -47,7 +48,7 @@ },
 			this.add(
-				'define("amber_vm/_init", ["amber_vm/smalltalk", "amber_vm/globals", "' + this.ids.join('","') + '"], function (vm, globals) {',
-				'vm.initialize();',
+				'define("amber/_init", ["' + this.ids.join('","') + '"], function (boot) {',
+				'boot.vm.initialize();',
 				realWork,
 				'});',
-				'requirejs("amber_vm/_init");'
+				'requirejs("amber/_init");'
 			);
@@ -76,2 +77,3 @@ },
 	this.amber_dir = amber_dir;
+	// Important: in next list, boot MUST be first
 	this.kernel_libraries = ['boot', 'smalltalk', 'globals', 'nil', '_st', 'Kernel-Objects', 'Kernel-Classes', 'Kernel-Methods',
@@ -126,2 +128,3 @@ 'Kernel-Collections', 'Kernel-Infrastructure', 'Kernel-Exceptions', 'Kernel-Transcript',
 		configuration.jsLibraryDirs.push(path.join(this.amber_dir, 'support'));
+		configuration.jsLibraryDirs.push(path.join(this.amber_dir, 'support', 'deprecated-vm-files'));
 	}
@@ -332,5 +335,5 @@
 			// matches and returns the "module_id" string in the AMD definition: define("module_id", ...)
-			var match = ('' + data).match(/^define\("([^"]*)"/);
+			var match = ('' + data).match(/(^|\n)define\("([^"]*)"/);
 			if (match) {
-				builder.addId(match[1]);
+				builder.addId(match[2]);
 			}
@@ -370,4 +373,7 @@ });
 		});
+		//backward compatibility
+		if (builder.ids.indexOf("amber_vm/boot") === -1) { console.log(builder.ids); console.log("defining amber_vm/boot"); builder.add('define("amber_vm/boot", ["amber/boot"], function (boot) { return boot; });'); }
+
 		// store the generated smalltalk env in configuration.{vm,globals}
-		builder.finish('configuration.vm = vm; configuration.globals = globals;');
+		builder.finish('configuration.vm = boot.vm; configuration.globals = boot.globals;');
 		loadIds.forEach(function (id) {
@@ -556,5 +562,5 @@ builder.add('requirejs("' + id + '");');
 				// matches and returns the "module_id" string in the AMD define: define("module_id", ...)
-				var match = buffer.toString().match(/^define\("([^"]*)"/);
+				var match = buffer.toString().match(/(^|\n)define\("([^"]*)"/);
 				if (match /*&& match[1].slice(0,9) !== "amber_vm/"*/) {
-					builder.addId(match[1]);
+					builder.addId(match[2]);
 				}
@@ -567,4 +573,6 @@ builder.add(buffer);
 		});
+		//backward compatibility
+		if (builder.ids.indexOf("amber_vm/boot") === -1) { builder.add('define("amber_vm/boot", ["amber/boot"], function (boot) { return boot; });'); }
 
-		var mainFunctionOrFile = '';
+		var mainFunctionOrFile = 'var vm = boot.vm, globals = boot.globals;\n';
 
@@ -571,0 +579,0 @@ if (undefined !== configuration.main) {

lib/Test.js

@@ -0,0 +0,0 @@ define("amber_core/Test", ["amber_vm/smalltalk", "amber_vm/nil", "amber_vm/_st", "amber_vm/globals", "amber_core/Kernel-Objects"], function(smalltalk,nil,_st, globals){

package.json

 {
   "name": "amber-dev",
-  "version": "0.1.0",
+  "version": "0.1.1",
   "description": "Development goodies for Amber Smalltalk",
@@ -5,0 +5,0 @@ "scripts": {

tasks/grunt-amberc.js

@@ -0,0 +0,0 @@ module.exports = function(grunt) {

New alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Fixed alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Improved metrics

Lines of code

800

increased by0.88%

Worsened metrics

Total package byte prevSize

30510

decreased by-0.98%

Number of downloads

2

decreased by-50%

No dependency changes