Просмотр исходного кода

Remove the es6-promise polyfill.

Amber requires a native Promise and no longer ships the polyfill. The
pages stop loading it, the bundled app requires __app__ directly, and
the dependency and its AMD path go with it.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Herby Vojčík 11 часов назад
Родитель
Сommit
b40415159c
7 измененных файлов с 7 добавлено и 25 удалено
  1. 5 6
      Gruntfile.js
  2. 0 1
      _layouts/index.html
  3. 1 2
      config.js
  4. 0 5
      es6-promise.amd.json
  5. 0 1
      learn.html
  6. 1 2
      package.json
  7. 0 8
      the.js

+ 5 - 6
Gruntfile.js

@@ -16,9 +16,8 @@ module.exports = function (grunt) {
     grunt.registerTask('devel', ['amdconfig:app', 'requirejs:devel']);
     grunt.registerTask('devel', ['amdconfig:app', 'requirejs:devel']);
     grunt.registerTask('deploy', ['amdconfig:app', 'requirejs:deploy']);
     grunt.registerTask('deploy', ['amdconfig:app', 'requirejs:deploy']);
 
 
-    var polyfillThenPromiseApp = function () {
-        define(["require", "amber/es6-promise"], function (require, promiseLib) {
-            promiseLib.polyfill();
+    var promiseApp = function () {
+        define(["require"], function (require) {
             return new Promise(function (resolve, reject) {
             return new Promise(function (resolve, reject) {
                 require(["__app__"], resolve, reject);
                 require(["__app__"], resolve, reject);
             });
             });
@@ -61,7 +60,7 @@ module.exports = function (grunt) {
                     mainConfigFile: "config.js",
                     mainConfigFile: "config.js",
                     rawText: {
                     rawText: {
                         "helios/index": "",
                         "helios/index": "",
-                        "app": '(' + polyfillThenPromiseApp + '());',
+                        "app": '(' + promiseApp + '());',
                         "__app__": 'define(["deploy", "amber/core/Platform-Browser"],function(x){return x});'
                         "__app__": 'define(["deploy", "amber/core/Platform-Browser"],function(x){return x});'
                     },
                     },
                     pragmas: {
                     pragmas: {
@@ -79,7 +78,7 @@ module.exports = function (grunt) {
                 options: {
                 options: {
                     mainConfigFile: "config.js",
                     mainConfigFile: "config.js",
                     rawText: {
                     rawText: {
-                        "app": '(' + polyfillThenPromiseApp + '());',
+                        "app": '(' + promiseApp + '());',
                         "__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__'],
                     include: ['config', 'node_modules/requirejs/require', 'app', '__app__'],
@@ -99,7 +98,7 @@ module.exports = function (grunt) {
                                 });
                                 });
                             });
                             });
                         } + "());",
                         } + "());",
-                        "app": "(" + polyfillThenPromiseApp + "());"
+                        "app": "(" + promiseApp + "());"
                     },
                     },
                     paths: {"amber_devkit": helpers.libPath},
                     paths: {"amber_devkit": helpers.libPath},
                     pragmas: {
                     pragmas: {

+ 0 - 1
_layouts/index.html

@@ -10,7 +10,6 @@
     <link href='//fonts.googleapis.com/css?family=Arapey:400italic,400' rel='stylesheet' type='text/css'>
     <link href='//fonts.googleapis.com/css?family=Arapey:400italic,400' rel='stylesheet' type='text/css'>
     <link href='//fonts.googleapis.com/css?family=Open+Sans' rel='stylesheet' type='text/css'>
     <link href='//fonts.googleapis.com/css?family=Open+Sans' rel='stylesheet' type='text/css'>
 
 
-    <script type='text/javascript' src='/node_modules/es6-promise/dist/es6-promise.auto.js'></script>
     <script type='text/javascript' src='the.js'></script>
     <script type='text/javascript' src='the.js'></script>
     <script type='text/javascript'>
     <script type='text/javascript'>
         // TODO remove, deprecated
         // TODO remove, deprecated

+ 1 - 2
config.js

@@ -4,7 +4,6 @@ var require;
 if (!require) require = {config: function (x) {require = x;}};
 if (!require) require = {config: function (x) {require = x;}};
 require.config({
 require.config({
   "paths": {
   "paths": {
-    "amber/es6-promise": "node_modules/es6-promise/dist/es6-promise",
     "require-css": "node_modules/require-css",
     "require-css": "node_modules/require-css",
     "jquery-ui": "node_modules/jquery-ui-dist/jquery-ui",
     "jquery-ui": "node_modules/jquery-ui-dist/jquery-ui",
     "codemirror": "node_modules/codemirror",
     "codemirror": "node_modules/codemirror",
@@ -13,10 +12,10 @@ require.config({
     "profstef": "node_modules/@ambers/prof-stef/src",
     "profstef": "node_modules/@ambers/prof-stef/src",
     "amber": "node_modules/@ambers/lang/base",
     "amber": "node_modules/@ambers/lang/base",
     "amber/core": "node_modules/@ambers/lang/src",
     "amber/core": "node_modules/@ambers/lang/src",
+    "domite": "node_modules/@ambers/domite/src",
     "amber/web": "node_modules/@ambers/contrib-web/src",
     "amber/web": "node_modules/@ambers/contrib-web/src",
     "amber/legacy": "node_modules/@ambers/contrib-legacy/src",
     "amber/legacy": "node_modules/@ambers/contrib-legacy/src",
     "amber/legacy/resources": "node_modules/@ambers/contrib-legacy/resources",
     "amber/legacy/resources": "node_modules/@ambers/contrib-legacy/resources",
-    "domite": "node_modules/@ambers/domite/src",
     "amber/jquery": "node_modules/@ambers/contrib-jquery/src",
     "amber/jquery": "node_modules/@ambers/contrib-jquery/src",
     "amber/website": "src"
     "amber/website": "src"
   },
   },

+ 0 - 5
es6-promise.amd.json

@@ -1,5 +0,0 @@
-{
-  "paths": {
-    "amber/es6-promise": ["./es6-promise", "./dist/es6-promise", "./promise"]
-  }
-}

+ 0 - 1
learn.html

@@ -6,7 +6,6 @@
     <link href='http://fonts.googleapis.com/css?family=Istok+Web' rel='stylesheet' type='text/css'>
     <link href='http://fonts.googleapis.com/css?family=Istok+Web' rel='stylesheet' type='text/css'>
     <meta name="author" content="Nicolas Petton">
     <meta name="author" content="Nicolas Petton">
     <link rel="stylesheet" type="text/css" href="css/profstef.css">
     <link rel="stylesheet" type="text/css" href="css/profstef.css">
-    <script type='text/javascript' src='/node_modules/es6-promise/dist/es6-promise.auto.js'></script>
     <script type='text/javascript' src='the.js'></script>
     <script type='text/javascript' src='the.js'></script>
     <script type='text/javascript'>
     <script type='text/javascript'>
         // TODO remove, deprecated
         // TODO remove, deprecated

+ 1 - 2
package.json

@@ -31,8 +31,7 @@
     "@ambers/contrib-legacy": "^0.11.0",
     "@ambers/contrib-legacy": "^0.11.0",
     "@ambers/lang": "^0.31.0",
     "@ambers/lang": "^0.31.0",
     "@ambers/prof-stef": "^0.4.0",
     "@ambers/prof-stef": "^0.4.0",
-    "@ambers/silk": "^0.7.0",
-    "es6-promise": "^4.2.6"
+    "@ambers/silk": "^0.7.0"
   },
   },
   "devDependencies": {
   "devDependencies": {
     "@ambers/sdk": "^0.13.0",
     "@ambers/sdk": "^0.13.0",

Разница между файлами не показана из-за своего большого размера
+ 0 - 8
the.js


Некоторые файлы не были показаны из-за большого количества измененных файлов