Browse Source

Update to use v0.23.0.

Herby Vojčík 5 years ago
parent
commit
67819d56b1
4 changed files with 19 additions and 56 deletions
  1. 7 5
      Gruntfile.js
  2. 5 42
      config.js
  3. 6 8
      package.json
  4. 1 1
      the.js

+ 7 - 5
Gruntfile.js

@@ -46,7 +46,7 @@ module.exports = function (grunt) {
                     'src/AmberWebsite-Tests.st' // list all tests in dependency order
                 ],
                 amd_namespace: 'amber/website',
-                libraries: ['amber_core/SUnit', 'amber/web/Web', 'silk/Silk']
+                libraries: ['amber/core/SUnit', 'amber/web/Web', 'silk/Silk']
             }
         },
 
@@ -60,8 +60,9 @@ module.exports = function (grunt) {
                 options: {
                     mainConfigFile: "config.js",
                     rawText: {
+                        "helios/index": "",
                         "app": '(' + polyfillThenPromiseApp + '());',
-                        "__app__": 'define(["deploy", "amber_core/Platform-Browser"],function(x){return x});'
+                        "__app__": 'define(["deploy", "amber/core/Platform-Browser"],function(x){return x});'
                     },
                     pragmas: {
                         excludeIdeData: true,
@@ -69,6 +70,7 @@ module.exports = function (grunt) {
                     },
                     include: ['config', 'node_modules/requirejs/require', 'app'],
                     findNestedDependencies: true,
+                    exclude: ['helios/index'],
                     optimize: "uglify2",
                     out: "the.js"
                 }
@@ -78,10 +80,10 @@ module.exports = function (grunt) {
                     mainConfigFile: "config.js",
                     rawText: {
                         "app": '(' + polyfillThenPromiseApp + '());',
-                        "__app__": 'define(["devel", "amber_core/Platform-Browser"],function(x){return x});'
+                        "__app__": 'define(["devel", "amber/core/Platform-Browser"],function(x){return x});'
                     },
                     include: ['config', 'node_modules/requirejs/require', 'app', '__app__'],
-                    exclude: ['devel', 'amber_core/Platform-Browser'],
+                    exclude: ['devel', 'amber/core/Platform-Browser'],
                     out: "the.js"
                 }
             },
@@ -91,7 +93,7 @@ module.exports = function (grunt) {
                     rawText: {
                         "jquery": "/* do not load in node test runner */",
                         "__app__": "(" + function () {
-                            define(["testing", "amber_core/Platform-Node", "amber_devkit/NodeTestRunner"], function (amber) {
+                            define(["testing", "amber/core/Platform-Node", "amber_devkit/NodeTestRunner"], function (amber) {
                                 amber.initialize().then(function () {
                                     amber.globals.NodeTestRunner._main();
                                 });

+ 5 - 42
config.js

@@ -9,70 +9,33 @@ require.config({
     "jquery-ui": "node_modules/jquery-ui-dist/jquery-ui",
     "codemirror": "node_modules/codemirror",
     "jquery": "node_modules/jquery/dist/jquery",
-    "typeahead": "node_modules/typeahead.js/dist/typeahead.jquery",
-    "helios/showdown": "node_modules/showdown/src/showdown",
-    "requireJS": "node_modules/requirejs/require",
-    "bootstrap": "node_modules/bootstrap/dist",
-    "tingle": "node_modules/tingle.js/dist/tingle",
-    "mousetrap": "node_modules/mousetrap/mousetrap",
-    "profstef": "node_modules/@ambers/prof-stef/src",
     "silk": "node_modules/@ambers/silk/src",
-    "domite": "node_modules/@ambers/domite/src",
-    "amber/web": "node_modules/@ambers/contrib-web/src",
+    "profstef": "node_modules/@ambers/prof-stef/src",
     "amber": "node_modules/@ambers/lang/base",
-    "amber_core": "node_modules/@ambers/lang/src",
+    "amber/core": "node_modules/@ambers/lang/src",
+    "amber/web": "node_modules/@ambers/contrib-web/src",
     "amber/legacy": "node_modules/@ambers/contrib-legacy/src",
     "amber/legacy/resources": "node_modules/@ambers/contrib-legacy/resources",
+    "domite": "node_modules/@ambers/domite/src",
     "amber/jquery": "node_modules/@ambers/contrib-jquery/src",
-    "helios": "node_modules/@ambers/helios/src",
-    "helios/resources": "node_modules/@ambers/helios/resources",
-    "helios/index": "node_modules/@ambers/helios/index",
-    "amber-ide-starter-dialog": "node_modules/@ambers/ide-starter-modal/lib/idestarter",
     "amber/website": "src"
   },
   "map": {
     "*": {
       "css": "require-css/css",
-      "amber/domite/DOMite": "domite/DOMite",
-      "amber/domite/DOMite-Tests": "domite/DOMite-Tests",
-      "00comment": "These are backward compatibility pointers.",
-      "amber-contrib-web/Web": "amber/web/Web",
-      "amber_core/Web": "amber/web/Web",
-      "amber_core/Canvas": "amber/web/Web",
-      "amber_core/Compiler-Exceptions": "amber_core/Compiler-Core",
-      "amber_core/Kernel-ImportExport": "amber_core/Platform-ImportExport",
-      "amber-attic/Benchfib": "amber/legacy/Benchfib",
-      "amber-attic/Examples": "amber/legacy/Examples",
-      "amber-attic/IDE": "amber/legacy/IDE",
-      "amber-contrib-jquery/Wrappers-JQuery": "amber/jquery/Wrappers-JQuery"
+      "amber_core": "amber/core"
     }
   },
   "shim": {
     "jquery-ui": {
       "deps": [
-        "jquery",
-        "jquery",
         "jquery"
       ]
     },
     "codemirror/lib/codemirror": {
       "deps": [
-        "css!codemirror/lib/codemirror",
-        "css!codemirror/lib/codemirror",
         "css!codemirror/lib/codemirror"
       ]
-    },
-    "typeahead": {
-      "deps": [
-        "jquery"
-      ],
-      "exports": "jQuery.fn.typeahead"
-    },
-    "bootstrap/js/bootstrap": {
-      "deps": [
-        "jquery",
-        "css!bootstrap/css/bootstrap"
-      ]
     }
   }
 });

+ 6 - 8
package.json

@@ -28,16 +28,14 @@
     "test": "grunt test"
   },
   "dependencies": {
-    "@ambers/contrib-legacy": "^0.7.1",
-    "@ambers/lang": "^0.22.2",
-    "@ambers/prof-stef": "^0.2.0",
-    "@ambers/silk": "^0.4.0",
-    "es6-promise": "^4.2.4"
+    "@ambers/contrib-legacy": "^0.8.0",
+    "@ambers/lang": "^0.23.0",
+    "@ambers/prof-stef": "^0.3.0",
+    "@ambers/silk": "^0.5.1",
+    "es6-promise": "^4.2.6"
   },
   "devDependencies": {
-    "@ambers/ide-starter-modal": "^0.2.0",
-    "@ambers/sdk": "^0.10.7",
-    "@ambers/helios": "^0.10.0",
+    "@ambers/sdk": "^0.12.0",
     "grunt": "^1.0.3",
     "grunt-contrib-clean": "^1.1.0",
     "grunt-contrib-requirejs": "^1.0.0",

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