Browse Source

npm cleanup

Herbert Vojčík 8 years ago
parent
commit
2283064e1a
4 changed files with 12 additions and 52 deletions
  1. 1 39
      Gruntfile.js
  2. 8 8
      config.js
  3. 2 4
      package.json
  4. 1 1
      the.js

+ 1 - 39
Gruntfile.js

@@ -4,14 +4,11 @@ module.exports = function (grunt) {
     var path = require('path');
 
     // These plugins provide necessary tasks.
-    grunt.loadNpmTasks('grunt-contrib-clean');
     grunt.loadNpmTasks('grunt-contrib-requirejs');
-    grunt.loadNpmTasks('grunt-execute');
     grunt.loadNpmTasks('amber-dev');
 
     // Default task.
     grunt.registerTask('default', ['amberc:all']);
-    grunt.registerTask('test', ['amberc:test_runner', 'execute:test_runner', 'clean:test_runner']);
     grunt.registerTask('devel', ['amdconfig:app', 'requirejs:devel']);
     grunt.registerTask('deploy', ['amdconfig:app', 'requirejs:deploy']);
 
@@ -25,32 +22,6 @@ module.exports = function (grunt) {
             '* Copyright (c) <%= grunt.template.today("yyyy") %> <%= pkg.author.name %>;' +
             ' Licensed <%= _.pluck(pkg.licenses, "type").join(", ") %> */\n',
         // task configuration
-        amberc: {
-            options: {
-                amber_dir: path.join(__dirname, "bower_components", "amber"),
-                library_dirs: ['src'],
-                closure_jar: ''
-            },
-            all: {
-                src: [
-
-                ],
-                amd_namespace: 'amber-trysmalltalk',
-                libraries: ['SUnit', 'Web']
-            },
-            test_runner: {
-                src: ['node_modules/amber-dev/lib/Test.st'],
-                libraries: [
-                    /* add dependencies packages here */
-                    /* add other code-to-test packages here */
-                    'SUnit',
-                    /* add other test packages here */
-                ],
-                main_class: 'NodeTestRunner',
-                output_name: 'test_runner'
-            }
-        },
-
         amdconfig: {app: {dest: 'config.js'}},
 
         requirejs: {
@@ -63,6 +34,7 @@ module.exports = function (grunt) {
                     excludeIdeData: true,
                     excludeDebugContexts: true
                 },
+                optimize: 'uglify2',
                 include: ['config', 'node_modules/requirejs/require', 'deploy'],
                 out: "the.js"
             }},
@@ -74,16 +46,6 @@ module.exports = function (grunt) {
                 include: ['config', 'node_modules/requirejs/require'],
                 out: "the.js"
             }}
-        },
-
-        execute: {
-            test_runner: {
-                src: ['test_runner.js']
-            }
-        },
-
-        clean: {
-            test_runner: ['test_runner.js']
         }
     });
 

+ 8 - 8
config.js

@@ -4,22 +4,22 @@ var require;
 if (!require) require = {config: function (x) {require = x;}};
 require.config({
   "paths": {
+    "jquery": "bower_components/jquery/jquery",
     "helios/showdown": "bower_components/showdown/src/showdown",
     "requireJS": "node_modules/requirejs/require",
-    "jquery": "bower_components/jquery/jquery",
+    "require-css": "bower_components/require-css",
     "jquery-ui": "bower_components/jquery-ui/jquery-ui",
     "codemirror": "bower_components/codemirror",
     "bootstrap2.3.2": "bower_components/bootstrap2.3.2/bootstrap",
-    "require-css": "bower_components/require-css",
     "mousetrap": "bower_components/mousetrap/mousetrap",
     "jquery.blockUI": "bower_components/blockui/jquery.blockUI",
     "amber-trysmalltalk": "bower_components/trysmalltalk/src",
     "helios": "bower_components/helios/src",
     "helios/resources": "bower_components/helios/resources",
     "helios/index": "bower_components/helios/index",
+    "amber-ide-starter-dialog": "bower_components/amber-ide-starter-dialog/lib/idestarter",
     "amber-attic": "bower_components/amber-attic/src",
     "amber-attic/resources": "bower_components/amber-attic/resources",
-    "amber-ide-starter-dialog": "bower_components/amber-ide-starter-dialog/lib/idestarter",
     "amber": "bower_components/amber/support",
     "amber_core": "bower_components/amber/src",
     "amber-trysmalltalkdemo": "src"
@@ -28,6 +28,11 @@ require.config({
   "rjs_comment2": "it's backward compatibility hack if config finds",
   "rjs_comment3": "support/requirejs before node_modules/requirejs;",
   "rjs_comment4": "the former will go away in 0.14.0",
+  "map": {
+    "*": {
+      "css": "require-css/css"
+    }
+  },
   "shim": {
     "jquery-ui": {
       "deps": [
@@ -50,10 +55,5 @@ require.config({
     "ensure-console": {
       "exports": "console"
     }
-  },
-  "map": {
-    "*": {
-      "css": "require-css/css"
-    }
   }
 });

+ 2 - 4
package.json

@@ -25,14 +25,12 @@
     "node": ">= 0.8.0"
   },
   "scripts": {
-    "test": "grunt test"
+    "test": "echo No testing && exit 1"
   },
   "devDependencies": {
-    "amber-dev": "^0.2.3",
+    "amber-dev": "^0.3.0",
     "grunt": "^0.4.5",
-    "grunt-contrib-clean": "^0.6.0",
     "grunt-contrib-requirejs": "^0.4.4",
-    "grunt-execute": "^0.2.2",
     "requirejs": "^2.1.15"
   },
   "keywords": [

File diff suppressed because it is too large
+ 1 - 1
the.js


Some files were not shown because too many files changed in this diff