Jelajahi Sumber

cli: use @ambers/grunt-init-amber-project.

Herby Vojčík 6 tahun lalu
induk
melakukan
2af709bf67

+ 2 - 2
external/amber-cli/package.json

@@ -34,10 +34,10 @@
     "test": "mocha"
   },
   "dependencies": {
+    "@ambers/grunt-init-amber-project": "^0.21.1",
     "@ambers/sdk": ">=0.10.5",
     "amber": ">=0.14.17",
-    "bower": "^1.6.0",
-    "grunt-init-amber": ">=0.14.18"
+    "bower": "^1.6.0"
   },
   "peerDependencies": {
     "grunt-init": "^0.3.1",

+ 2 - 2
external/amber-cli/src/AmberCli.js

@@ -2249,7 +2249,7 @@ var child,sanitizedTemplatePath;
 return $core.withContext(function($ctx1) {
 //>>excludeEnd("ctx");
 var $1,$3,$2;
-sanitizedTemplatePath=$recv($recv($recv($self["@path"])._join_with_($self["@nmPath"],"grunt-init-amber"))._replace_with_("\x5c\x5c","\x5c\x5c"))._replace_with_(":","\x5c:");
+sanitizedTemplatePath=$recv($recv($recv($self["@path"])._join_with_($self["@nmPath"],"@ambers/grunt-init-amber-project"))._replace_with_("\x5c\x5c","\x5c\x5c"))._replace_with_(":","\x5c:");
 //>>excludeStart("ctx", pragmas.excludeDebugContexts);
 $ctx1.sendIdx["replace:with:"]=1;
 //>>excludeEnd("ctx");
@@ -2281,7 +2281,7 @@ return self;
 },
 //>>excludeStart("ide", pragmas.excludeIdeData);
 args: ["aBlock"],
-source: "gruntInitThenDo: aBlock\x0a\x09| child sanitizedTemplatePath |\x0a\x09sanitizedTemplatePath := ((path join: nmPath with: 'grunt-init-amber')\x0a\x09\x09replace: '\x5c\x5c' with: '\x5c\x5c') replace: ':' with: '\x5c:'.\x0a\x09child := childProcess\x0a\x09\x09fork: (self npmScriptForModule: 'grunt-init' named: 'grunt-init')\x0a\x09\x09args: {sanitizedTemplatePath}.\x0a\x09child\x0a\x09\x09on: 'error' do: aBlock;\x0a\x09\x09on: 'close' do: [ :code |\x0a\x09\x09\x09aBlock value: (code = 0 ifTrue: [ nil ] ifFalse: [ code ]) ]",
+source: "gruntInitThenDo: aBlock\x0a\x09| child sanitizedTemplatePath |\x0a\x09sanitizedTemplatePath := ((path join: nmPath with: '@ambers/grunt-init-amber-project')\x0a\x09\x09replace: '\x5c\x5c' with: '\x5c\x5c') replace: ':' with: '\x5c:'.\x0a\x09child := childProcess\x0a\x09\x09fork: (self npmScriptForModule: 'grunt-init' named: 'grunt-init')\x0a\x09\x09args: {sanitizedTemplatePath}.\x0a\x09child\x0a\x09\x09on: 'error' do: aBlock;\x0a\x09\x09on: 'close' do: [ :code |\x0a\x09\x09\x09aBlock value: (code = 0 ifTrue: [ nil ] ifFalse: [ code ]) ]",
 referencedClasses: [],
 //>>excludeEnd("ide");
 messageSends: ["replace:with:", "join:with:", "fork:args:", "npmScriptForModule:named:", "on:do:", "value:", "ifTrue:ifFalse:", "="]

+ 1 - 1
external/amber-cli/src/AmberCli.st

@@ -1005,7 +1005,7 @@ finishMessage
 
 gruntInitThenDo: aBlock
 	| child sanitizedTemplatePath |
-	sanitizedTemplatePath := ((path join: nmPath with: 'grunt-init-amber')
+	sanitizedTemplatePath := ((path join: nmPath with: '@ambers/grunt-init-amber-project')
 		replace: '\\' with: '\\') replace: ':' with: '\:'.
 	child := childProcess
 		fork: (self npmScriptForModule: 'grunt-init' named: 'grunt-init')