🔀 Merge branch 'github-actions-test'

.github/workflows/npm.yml

@@ -0,0 +1,35 @@
+name: Build npm package
+on: push
+jobs:
+  build:
+    if: contains(github.event.head_commit.message, '🔖')
+    runs-on: ubuntu-latest
+    permissions:
+      contents: read
+      packages: write
+    steps:
+      - uses: actions/checkout@v3
+      # Setup .npmrc file to use GitHub Packages
+      - uses: actions/setup-node@v3
+        with:
+          node-version: '10.x'
+          registry-url: 'https://npm.pkg.github.com'
+          # Defaults to the user or organization that owns the workflow file
+          scope: '@screeps'
+      - name: Install
+        run: npm ci
+        env:
+          NODE_AUTH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+      - name: Publish (github)
+        run: npm publish
+        env:
+          NODE_AUTH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+      - uses: actions/setup-node@v3
+        with:
+          node-version: '10.x'
+          registry-url: 'https://registry.npmjs.org'
+          scope: '@screeps'
+      - name: Publish (npmjs)
+        run: npm publish
+        env:
+          NODE_AUTH_TOKEN: ${{ secrets.NPMJS_TOKEN }}

.npmignore

@@ -2,6 +2,7 @@
 node_modules
 .idea
 .run
+.github
 build/config.gypi
 src/local-config.js
 dist/core

package.json

@@ -1,17 +1,18 @@
 {
   "name": "@screeps/engine",
-  "version": "4.2.16",
+  "version": "4.2.17-rc1",
   "bin": {
     "screeps-engine-main": "dist/main.js",
     "screeps-engine-runner": "dist/runner.js",
     "screeps-engine-processor": "dist/processor.js"
   },
   "main": "dist/index.js",
   "scripts": {
-    "test": "cross-env DRIVER_MODULE=@screeps/driver jasmine"
+    "test": "cross-env DRIVER_MODULE=@screeps/driver jasmine",
+    "prepublish": "gulp"
   },
   "dependencies": {
-    "@screeps/pathfinding": "^0.4.16",
+    "@screeps/pathfinding": "^0.4.17",
     "bulk-require": "^0.2.1",
     "cross-env": "^5.2.0",
     "lodash": "3.10.1",
@@ -41,5 +42,8 @@
       "transform-es2015-destructuring",
       "transform-strict-mode"
     ]
+  },
+  "browser": {
+    "@screeps/core": "@screeps/simcore"
   }
 }

src/game/game.js

@@ -6,7 +6,8 @@
         C = driver.constants,
         map = require('./map'),
         market = require('./market'),
-        customPrototypes = require('./custom-prototypes');
+        customPrototypes = require('./custom-prototypes'),
+        system = { Function: { bind: Function.bind } };
 
     var findCacheFn = {
         [C.FIND_CREEPS]: (i) => !i.spawning,
@@ -505,7 +506,7 @@
                 !_.isObject(runCodeCache[userId].globals.require.cache.main) || !_.isFunction(
                     runCodeCache[userId].globals.require.cache.main.loop)) {
 
-                runCodeCache[userId].globals.require = requireFn.bind(runCodeCache[userId]);
+                runCodeCache[userId].globals.require = system.Function.bind.call(requireFn, runCodeCache[userId]);
                 runCodeCache[userId].globals.require.cache = {lodash: runCodeCache[userId].globals._};
                 runCodeCache[userId].globals.require.timestamp = runCodeCache[userId].runtimeData.userCodeTimestamp;
             }

src/utils.js

@@ -15,7 +15,7 @@ catch(e) {}
 exports.getDriver = function getDriver() {
     driver = typeof process != 'undefined' && process.env.DRIVER_MODULE ?
         require(process.env.DRIVER_MODULE) :
-        require('./core/index');
+        require('@screeps/core');
     loadDriver();
     return driver;
 };